daemon: fixes for origin checks (#2537)