More fixes for join