Fix Namespaces tasks