Some fixes for scroll