More scroll fixes!