More improvements to scrolling