Fixes for namespacing