10.7 related fixes.
Resolved scroll bar issues.