Fix some redrawing shenanigans...