Fix scroll bugs