more scroll fixes