Fix root namespace issues