diff --git a/EventMonitor/ETWLog.cpp b/EventMonitor/ETWLog.cpp
index bf1aca2..8c94662 100644
--- a/EventMonitor/ETWLog.cpp
+++ b/EventMonitor/ETWLog.cpp
@@ -228,7 +228,7 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
             wxLogError(_("Access denied creating event session: you need administrative privileges (Run As Administrator) or be a member of Performance Log Users group to start event tracing session."));
             return;
         } else if (ulResult == ERROR_ALREADY_EXISTS) {
-            wxLogDebug(_("The %s event session already exists."), name.c_str());
+            wxLogDebug(_("The %s event session already exists."), name);
             // Do not despair... Retry with a new session name and ID.
             continue;
         } else {
@@ -703,7 +703,7 @@ void wxPersistentETWListCtrl::Save() const
     col.SetMask(wxLIST_MASK_TEXT | wxLIST_MASK_WIDTH);
     for (int i = 0, n = wnd->GetColumnCount(); i < n; i++) {
         wnd->GetColumn(i, col);
-        SaveValue(wxString::Format(wxT("Column%sWidth"), col.GetText().c_str()), col.GetWidth());
+        SaveValue(wxString::Format(wxT("Column%sWidth"), col.GetText()), col.GetWidth());
     }
 
     SaveValue(wxT("ScrollAuto"), wnd->m_scroll_auto);
@@ -728,7 +728,7 @@ bool wxPersistentETWListCtrl::Restore()
         wnd->GetColumn(i, col);
 
         int width;
-        if (RestoreValue(wxString::Format(wxT("Column%sWidth"), col.GetText().c_str()), &width))
+        if (RestoreValue(wxString::Format(wxT("Column%sWidth"), col.GetText()), &width))
             wnd->SetColumnWidth(i, width);
     }
 
diff --git a/lib/TLS_UI/src/TLS_UI.cpp b/lib/TLS_UI/src/TLS_UI.cpp
index 619136c..6789292 100644
--- a/lib/TLS_UI/src/TLS_UI.cpp
+++ b/lib/TLS_UI/src/TLS_UI.cpp
@@ -261,7 +261,7 @@ void wxTLSServerTrustPanel::OnRootCAAddFile(wxCommandEvent& event)
             for (PCCERT_CONTEXT cert = NULL; (cert = CertEnumCertificatesInStore(cs, cert)) != NULL;)
                 AddRootCA(cert);
         } else
-            wxMessageBox(wxString::Format(_("Invalid or unsupported certificate file %s"), paths[i].c_str()), _("Error"), wxOK | wxICON_EXCLAMATION, this);
+            wxMessageBox(wxString::Format(_("Invalid or unsupported certificate file %s"), paths[i]), _("Error"), wxOK | wxICON_EXCLAMATION, this);
     }
 }
 
diff --git a/lib/wxExtend b/lib/wxExtend
index dee95d7..c228655 160000
--- a/lib/wxExtend
+++ b/lib/wxExtend
@@ -1 +1 @@
-Subproject commit dee95d7d6c246fe521e2cd5c1f76937484f3717c
+Subproject commit c22865524dde5417b23d7f24763e591d99d357bb