Fix registration issues