Fixed display glitches