fixes for removesmallcontrols and ol2, ol3 and Lint