fix ORM-specific concerns