More tweaks to daemon control