Improvements to relationship field robustness, fixes #35