Minor scroll fixes