Fix registration issues.