Fix display glitches