Fix registration and validation