Scope provider fixes