Fixed issues with the Daemon.