Fix some of the scroll-check issues