Few infinite scroll fixes.

see #585