Fixed up some scrolling