Minor fixes

Changed paths and scopes