Fixes for namespaced enum variants