more neverending scroll fixes