ORM side fixes.