Minor shifter fixes