Fixes around redrawing points;