daemon fixes