join fixes