fixes for db validations