Final fixes to scrolling