More scrolling fixes