Minor scroller fixes