More scroll fixes