fixes for namespace refactor