Fix some redrawing issues