Fix registration errors