Minor ORM adjustments