diff --git a/src/spek-window.cc b/src/spek-window.cc
index 3de7599..bcaac68 100644
--- a/src/spek-window.cc
+++ b/src/spek-window.cc
@@ -36,7 +36,7 @@ SpekWindow::SpekWindow(const wxString& path) :
 {
     SetTitle(_("Spek - Acoustic Spectrum Analyser"));
     // TODO: test on all platforms
-    SetIcon(wxIcon(wxT("spek")));
+    //SetIcon(wxIcon(wxT("spek")));
 
     wxMenuBar *menu = new wxMenuBar();
 
diff --git a/src/spek.cc b/src/spek.cc
index 7fdbc5a..fa92184 100644
--- a/src/spek.cc
+++ b/src/spek.cc
@@ -68,8 +68,10 @@ bool Spek::OnInit()
             wxT_2("FILE"),
             wxCMD_LINE_VAL_STRING,
             wxCMD_LINE_PARAM_OPTIONAL
-        },
-        wxCMD_LINE_DESC_END
+        }, {
+            // TODO: use wxCMD_LINE_DESC_END after settling on wx29.
+            wxCMD_LINE_NONE, NULL, NULL, NULL, wxCMD_LINE_VAL_NONE, 0
+        }
     };
 
     wxCmdLineParser parser(desc, argc, argv);