Fix compilation errors from new enum namespacing rules