Fix register validations and constraints