Minor changes to scroll mode