Fix glitches 7