Fixing scrolling bugs