diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp
index ab2dcea848..b42bda52d8 100644
--- a/samples/stc/stctest.cpp
+++ b/samples/stc/stctest.cpp
@@ -555,7 +555,7 @@ void AppFrame::CreateMenu ()
 
     // Help menu
     wxMenu *menuHelp = new wxMenu;
-    menuHelp->Append (wxID_ABOUT, _("&About ..\tShift+F1"));
+    menuHelp->Append (wxID_ABOUT, _("&About ..\tCtrl+D"));
 
     // construct menu
     m_menuBar->Append (menuFile, _("&File"));
diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 6db3bc5c65..c60c74e626 100644
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -474,7 +474,8 @@ void wxHtmlHelpData::SetTempDir(const wxString& path)
         m_tempPath = path;
     else
     {
-        wxFileName fn(path);
+        wxFileName fn;
+        fn.AssignDir(path);
         fn.MakeAbsolute();
 
         m_tempPath = fn.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR);