diff --git a/six/modules/c++/six.sidd/source/DerivedXMLParser.cpp b/six/modules/c++/six.sidd/source/DerivedXMLParser.cpp
index 397c1920c..54b8d545f 100644
--- a/six/modules/c++/six.sidd/source/DerivedXMLParser.cpp
+++ b/six/modules/c++/six.sidd/source/DerivedXMLParser.cpp
@@ -1190,7 +1190,7 @@ XMLElem DerivedXMLParser::createFootprint(const std::string& name,
     XMLElem footprint = newElement(name, getDefaultURI(), parent);
     xml::lite::AttributeNode node;
     node.setQName("size");
-    node.setValue(str::toString(LatLonCorners::NUM_CORNERS));
+    node.setValue(std::to_string(LatLonCorners::NUM_CORNERS));
 
     footprint->getAttributes().add(node);
 
@@ -1200,7 +1200,7 @@ XMLElem DerivedXMLParser::createFootprint(const std::string& name,
 
     for (size_t corner = 0; corner < LatLonCorners::NUM_CORNERS; ++corner)
     {
-        node.setValue(str::toString(corner + 1));
+        node.setValue(std::to_string(corner + 1));
         common().createLatLon(cornerName,
                              corners.getCorner(corner),
                              footprint)->getAttributes().add(node);
diff --git a/six/modules/c++/six/source/XMLControl.cpp b/six/modules/c++/six/source/XMLControl.cpp
index ca359a49e..5f755caed 100644
--- a/six/modules/c++/six/source/XMLControl.cpp
+++ b/six/modules/c++/six/source/XMLControl.cpp
@@ -410,8 +410,7 @@ std::string XMLControl::dataTypeToString(DataType dataType, bool appendXML)
         str = "SIDD";
         break;
     default:
-        throw except::Exception(
-            Ctxt("Invalid data type " + str::toString(dataType)));
+        throw except::Exception(Ctxt("Invalid data type " + str::toString(dataType)));
     }
 
     if (appendXML)
diff --git a/six/projects/csm/source/SIDDSensorModel.cpp b/six/projects/csm/source/SIDDSensorModel.cpp
index fe068fbbe..77bd39e47 100644
--- a/six/projects/csm/source/SIDDSensorModel.cpp
+++ b/six/projects/csm/source/SIDDSensorModel.cpp
@@ -205,13 +205,8 @@ void SIDDSensorModel::initializeFromISD(const csm::Nitf21Isd& isd,
         if (siddXML == nullptr)
         {
             const std::string message = (numSIDD == 0) ? "Not a SIDD" :
-                    "Found " + str::toString(numSIDD) +
-                    " SIDD XMLs but requested image index " +
-                    str::toString(imageIndex);
-
-            throw csm::Error(csm::Error::SENSOR_MODEL_NOT_CONSTRUCTIBLE,
-                               message,
-                               "SIDDSensorModel::SIDDSensorModel");
+                    "Found " + std::to_string(numSIDD) + " SIDD XMLs but requested image index " + std::to_string(imageIndex);
+            throw csm::Error(csm::Error::SENSOR_MODEL_NOT_CONSTRUCTIBLE, message, "SIDDSensorModel::SIDDSensorModel");
         }
 
         // get xml as string for sensor model state
diff --git a/six/projects/csm/source/SIXPlugin.cpp b/six/projects/csm/source/SIXPlugin.cpp
index 4b75ad810..4c1773099 100644
--- a/six/projects/csm/source/SIXPlugin.cpp
+++ b/six/projects/csm/source/SIXPlugin.cpp
@@ -83,9 +83,7 @@ std::string SIXPlugin::getModelName(size_t modelIndex) const
     case SIDD_MODEL_INDEX:
         return SIDDSensorModel::NAME;
     default:
-        throw csm::Error(csm::Error::INDEX_OUT_OF_RANGE,
-                           "Model index is " + str::toString(modelIndex),
-                            "SIXPlugin::getModelName");
+        throw csm::Error(csm::Error::INDEX_OUT_OF_RANGE, "Model index is " + std::to_string(modelIndex), "SIXPlugin::getModelName");
     }
 }
 
@@ -98,9 +96,7 @@ std::string SIXPlugin::getModelFamily(size_t modelIndex) const
     case SIDD_MODEL_INDEX:
         return SIDDSensorModel::FAMILY;
     default:
-        throw csm::Error(csm::Error::INDEX_OUT_OF_RANGE,
-                           "Model index is " + str::toString(modelIndex),
-                            "SIXPlugin::getModelFamily");
+        throw csm::Error(csm::Error::INDEX_OUT_OF_RANGE, "Model index is " + std::to_string(modelIndex), "SIXPlugin::getModelFamily");
     }
 }