Scope fixes
0.5.3