Scope fixes