Fix validation issue with updating models