Fixes to join