fixes for scroll