Correct glitches introduced by last update