Small changes to ORM hydrator