Fix excess redraws