Fixed redraw issues.