Small fixes for scroll