clone fixes for containers and namespaces