More scrolling fixes. Hopefully this wont break something else again...