Fix broken scopes.