Fix a few more redraw glitches.