Pulled in scroll bug fixes

Neglected to add bug fixes in last commit