diff --git a/src/menus/HelpMenus.cpp b/src/menus/HelpMenus.cpp
index 0591ba36c..3fbfefbfd 100644
--- a/src/menus/HelpMenus.cpp
+++ b/src/menus/HelpMenus.cpp
@@ -52,7 +52,8 @@ void ShowDiagnostics(
          .Style(wxTE_MULTILINE | wxTE_READONLY | wxTE_RICH)
          .AddTextWindow("");
 
-      S.AddStandardButtons(eOkButton | eCancelButton);
+      wxButton *save = safenew wxButton(S.GetParent(), wxID_OK, _("&Save"));
+      S.AddStandardButtons(eCancelButton, save);
    }
    S.EndVerticalLay();
 
@@ -64,7 +65,6 @@ void ShowDiagnostics(
 
    *text << info;
 
-   dlg.FindWindowById(wxID_OK)->SetLabel(_("&Save"));
    dlg.SetSize(350, 450);
 
    if (dlg.ShowModal() == wxID_OK)
diff --git a/src/menus/TransportMenus.cpp b/src/menus/TransportMenus.cpp
index 43fc10ea2..232a101ca 100644
--- a/src/menus/TransportMenus.cpp
+++ b/src/menus/TransportMenus.cpp
@@ -32,6 +32,7 @@
 #include "../toolbars/TranscriptionToolBar.h"
 #include "../widgets/AudacityMessageBox.h"
 #include "../widgets/ErrorDialog.h"
+#include "../widgets/ProgressDialog.h"
 
 #include <float.h>