fixed some external namespaces