Bug fixes on smooth scroll