Some scroller fixes
Some other fixes