Fixing enum scoping