Fixes to the scroll issue