Fixes to relationships