Changes to improve scrolling performance