diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp
index 4061334b7..2e57e18f3 100644
--- a/src/effects/Effect.cpp
+++ b/src/effects/Effect.cpp
@@ -3032,7 +3032,7 @@ void EffectUIHost::OnInitDialog(wxInitDialogEvent & evt)
    wxDialog::OnInitDialog(evt);
 
 #if wxCHECK_VERSION(3, 0, 0)
-#warning "check to see if this still needed in wx3"
+//#warning "check to see if this still needed in wx3"
 #endif
 
    // Pure hackage coming down the pike...
diff --git a/src/widgets/ErrorDialog.h b/src/widgets/ErrorDialog.h
index b717a52b9..122e8409b 100644
--- a/src/widgets/ErrorDialog.h
+++ b/src/widgets/ErrorDialog.h
@@ -46,11 +46,15 @@ class HtmlTextHelpDialog : public BrowserFrame
 public:
    HtmlTextHelpDialog() : BrowserFrame()
    {
+#if !wxCHECK_VERSION(3, 1, 0)
       MakeModal( true );
+#endif
    }
    virtual ~HtmlTextHelpDialog()
    {
+#if !wxCHECK_VERSION(3, 1, 0)
       MakeModal( false );
+#endif
       // On Windows, for some odd reason, the Audacity window will be sent to
       // the back.  So, make sure that doesn't happen.
       GetParent()->Raise();
diff --git a/src/widgets/ProgressDialog.cpp b/src/widgets/ProgressDialog.cpp
index ee7f0d454..e30f9e8c8 100644
--- a/src/widgets/ProgressDialog.cpp
+++ b/src/widgets/ProgressDialog.cpp
@@ -1392,8 +1392,11 @@ ProgressDialog::Update(int value, const wxString & message)
 
       mLastUpdate = now;
    }
-
+#if wxCHECK_VERSION(3, 0, 0)
+   wxEventLoopBase *loop = wxEventLoop::GetActive();
+#else
    wxEventLoop *loop = wxEventLoop::GetActive();
+#endif
    if (loop)
    {
       int i = 10;
@@ -1627,7 +1630,11 @@ int TimerProgressDialog::Update(const wxString & message /*= wxEmptyString*/)
       mLastUpdate = now;
    }
 
+#if wxCHECK_VERSION(3, 0, 0)
+   wxEventLoopBase *loop = wxEventLoop::GetActive();
+#else
    wxEventLoop *loop = wxEventLoop::GetActive();
+#endif
    if (loop)
    {
       int i = 10;