fixing migrations and validations