Fix conversion of ShiftChanges to Shifts