Fixup minor scrolling issues