Bug fix in daemon stop methods