More fixes to related object implicit join support