Re-apply scoping changes