Fix the remaining window scrolling issues