Fix a few infinite-scrolling bugs ...