Little tweaks trying to fix the scrolling bug