Scope fixes
Fixing scope