Fixes to scope