#1,#2 .. scrolling fixes