Fix some 'forgot to redraw' issues