Fix scroll handling