Correct missing fields after naturalKeys added to ORM