Some more minor changes to scope