More redraw improvements