Daemon code enhancements.