Fixing some scroll issues