Scroll behaviour fixes