Fix issues related to NamespaceHosts