Minor changes in Daemon