Daemon improvements