Fix issues with scroll