More fixes to relationships