factory register fixes