Index: source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp
===================================================================
--- source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp	(revision 9796)
+++ source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp	(working copy)
@@ -125,7 +125,7 @@
 	qry.Post();
 	std::vector<std::wstring> passClasses = *qry.classNames;
 	for (size_t i = 0; i < passClasses.size(); ++i)
-		m_PassabilityChoice->Append(passClasses[i]);
+		m_PassabilityChoice->Append(passClasses[i].c_str());
 
 	static_cast<TerrainBottomBar*>(m_BottomBar)->LoadTerrain();
 }
Index: source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
===================================================================
--- source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp	(revision 9796)
+++ source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp	(working copy)
@@ -792,7 +792,7 @@
 	qSimStateDebugDump q(doBinary);
 	q.Post();
 
-	wxString state(std::wstring(*q.dump));
+	wxString state((std::wstring(*q.dump)).c_str());
 
 	wxFFile file(filename.c_str(), _T("w"));
 	if (file.IsOpened() && !file.Error())