more join fixes