Minor changes to improve scrolling behavior