More register fixes