Redrawing fixes