NamespaceStructure sniff tweaks