Fixes to guarantee a daemon comes up