More fixes to clearing of highlight and stroke