more shifter fixes