Fix glitches/errors