Default scope fixes