Fixes for smoother scrolling