redraw fixes