Fixed up some infinite scrolling issues