scope fixes