Fixes to Scroll, Fix scissor