Scope fixes from Arnav