[Infinit scrolling] Fixes