changes to make validations work on production