Simple changes to daemon and others