diff --git a/libs/core/cdutils_core.cpp b/libs/core/cdutils_core.cpp
index 685694d..90862f8 100644
--- a/libs/core/cdutils_core.cpp
+++ b/libs/core/cdutils_core.cpp
@@ -558,7 +558,7 @@ PIString CDCore::pathToString(const PIDeque<int> & p) {
 	PIString ret;
 	for (int i = 0; i < p.size_s(); ++i) {
 		if (!ret.isEmpty()) ret += ".";
-		ret << p[i];
+		ret += PIString::fromNumber(p[i]);
 	}
 	return ret;
 }
diff --git a/libs/core/cdutils_parser.cpp b/libs/core/cdutils_parser.cpp
index 2a41c07..19a86e3 100644
--- a/libs/core/cdutils_parser.cpp
+++ b/libs/core/cdutils_parser.cpp
@@ -150,7 +150,7 @@ CDSection CDParser::parse(PIIODevice * d, int cdsection_type) {
 								ts.section(evals[i]).alias = enames[i];
 							}
 							ts.name = is.name;
-							ts.name.insert(ibpos, PIString("[") << a << "]");
+							ts.name.insert(ibpos, PIString('[') + a + ']');
 							is = ts;
 							ts = CDSection(et);
 						}
diff --git a/libs/core/cdutils_types.cpp b/libs/core/cdutils_types.cpp
index c722270..b1e2b6f 100644
--- a/libs/core/cdutils_types.cpp
+++ b/libs/core/cdutils_types.cpp
@@ -183,9 +183,10 @@ void CDType::writeX(PIByteArray & ba) {
 bool CDType::calculate(PIEvaluator * e, PIVector<const CDType * > stack) {
 	if (stack.contains(this)) {
 		error_ = "Circular dependencies: ";
-		piForeachC (CDType * k, stack)
-			error_ << k->name() << " -> ";
-		error_ << name();
+		for (const CDType * k : stack) {
+			error_ += k->name() + " -> ";
+		}
+		error_ += name();
 		//piCout << error_;
 		return false;
 	}
@@ -452,33 +453,34 @@ void CDSection::write(PIIODevice * d, const PIString & prefix) {
 		switch (cd_type_) {
 		case CDType::cdNull: break;
 		case CDType::cdK:
-			l.clear(); l << ck.index() << ".f = " << ck.formula() << " #s " << ck.comment() << " \n";
+			l = PIString::fromNumber(ck.index()) + ".f = " + ck.formula() + " #s " + ck.comment() + " \n";
 			d->write(l.toUTF8());
-			l.clear(); l << ck.index() << ".v = " << ck.value() << " #" << ck.type() << " " << ck.name() << " \n";
+			l = PIString::fromNumber(ck.index()) + ".v = " + ck.value() + " #" + ck.type() + " " + ck.name() + " \n";
 			d->write(l.toUTF8());
 			if (!ck.enumValues().enum_list.isEmpty()) {
-				l.clear(); l << ck.index() << ".ev = {";
+				l = PIString::fromNumber(ck.index()) + ".ev = {";
 				//PIVector<CDType::Enumerator> el = ck.enumValues();
-				piForeachC (PIVariantTypes::Enumerator & e, ck.enumValues().enum_list)
-					l << e.value << " - " << e.name << ", ";
+				for (const PIVariantTypes::Enumerator & e : ck.enumValues().enum_list) {
+					l += e.value + " - " + e.name + ", ";
+				}
 				l.cutRight(2);
-				l << "} \n";
+				l += "} \n";
 				d->write(l.toUTF8());
 			}
 			break;
 		case CDType::cdX:
-			l.clear(); l << ck.index() << ".name = " << ck.name() << " #s " << ck.comment() << " \n";
+			l = PIString::fromNumber(ck.index()) + ".name = " + ck.name() + " #s " + ck.comment() + " \n";
 			d->write(l.toUTF8());
-			l.clear(); l << ck.index() << ".mode = " << ck.xmode() << " #e (0 - cur, 1 - all_avg) " << "\n";
+			l = PIString::fromNumber(ck.index()) + ".mode = " + ck.xmode() + " #e (0 - cur, 1 - all_avg) " + "\n";
 			d->write(l.toUTF8());
-			l.clear(); l << ck.index() << ".avg = " << ck.avg() << " #n " << "\n";
+			l = PIString::fromNumber(ck.index()) + ".avg = " + ck.avg() + " #n " + "\n";
 			d->write(l.toUTF8());
-			l.clear(); l << ck.index() << ".sel = " << (ck.isSelectedX() ? "1" : "0") << " #n " << "\n";
+			l = PIString::fromNumber(ck.index()) + ".sel = " + (ck.isSelectedX() ? "1" : "0") + " #n " + "\n";
 			d->write(l.toUTF8());
 			break;
 		case CDType::cdC:
 		case CDType::cdM:
-			l.clear(); l << ck.index() << ".name = " << ck.name() << " #s " << ck.comment() << " \n";
+			l = PIString::fromNumber(ck.index()) + ".name = " + ck.name() + " #s " + ck.comment() + " \n";
 			d->write(l.toUTF8());
 			break;
 		}