Fixing rebasing glitches