Fix validations.. again ;)