Correcting some glitches