More multiple join fixes.