Fix a few issues with scrolling