Daemon fixes