diff --git a/src/ui/simulator/toolbox/components/datagrid/renderer/area/thermal.areasummary.cpp b/src/ui/simulator/toolbox/components/datagrid/renderer/area/thermal.areasummary.cpp
index 0364b4dcaf..85b77e19e3 100644
--- a/src/ui/simulator/toolbox/components/datagrid/renderer/area/thermal.areasummary.cpp
+++ b/src/ui/simulator/toolbox/components/datagrid/renderer/area/thermal.areasummary.cpp
@@ -177,7 +177,9 @@ bool ThermalClusterSummarySingleArea::cellValue(int x, int y, const String& v)
         {
         case 0:
         {
-            if (cluster->group() != Yuni::CString(v))
+            std::string group = cluster->group().c_str();
+            std::string v_string;
+            if (group != v_string)
             {
                 cluster->setGroup(v);
                 return true;
diff --git a/src/ui/simulator/toolbox/components/datagrid/renderer/layers.cpp b/src/ui/simulator/toolbox/components/datagrid/renderer/layers.cpp
index e5d30d6164..2072c2cb73 100644
--- a/src/ui/simulator/toolbox/components/datagrid/renderer/layers.cpp
+++ b/src/ui/simulator/toolbox/components/datagrid/renderer/layers.cpp
@@ -227,13 +227,13 @@ wxString LayersUI::cellValue(int x, int y) const
 
             return layerPosition != layerListEnd
                      ? wxString::Format(wxT("%d"), pArea->ui->layerX[layerIterator->first])
-                     : wxT("-");
+                     : wxString(wxT("-"));
 
         case 2:
 
             return layerPosition != layerListEnd
                      ? wxString::Format(wxT("%d"), pArea->ui->layerY[layerIterator->first])
-                     : wxT("-");
+                     : wxString(wxT("-"));
         }
     }
     return wxEmptyString;