Fixing small glitches