Minor tweaks to scrollSpy and scrollTo