safe publication some minor fixes