More fixes to scrolling