file and repo scope fixes