Fixing glitches