Improve OneToOne handling

Fixes #743