Glitches fixed