More shift correction tweaks