A few minor scrolling fixes
Mergin'