Fixes to scrolling