Fix glitches