More infinte scroll fixes.