joins more fixes