More glitches fixed