Taking care of more scrolling bugs