More daemon fixes