Fix auto-scroll issues