diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp
index 96b3eaf61..a4282eabc 100644
--- a/plugins/channelrx/demodnfm/nfmdemod.cpp
+++ b/plugins/channelrx/demodnfm/nfmdemod.cpp
@@ -161,7 +161,7 @@ void NFMDemod::applySettings(const NFMDemodSettings& settings, bool force)
             << " m_ctcssIndex: " << settings.m_ctcssIndex
             << " m_ctcssOn: " << settings.m_ctcssOn
             << " m_dcsOn: " << settings.m_dcsOn
-            << " m_dcsCode: " << oct << settings.m_dcsCode << dec
+            << " m_dcsCode: " << Qt::oct << settings.m_dcsCode << Qt::dec
             << " m_dcsPositive: " << settings.m_dcsPositive
             << " m_highPass: " << settings.m_highPass
             << " m_audioMute: " << settings.m_audioMute
diff --git a/sdrbase/commands/command.cpp b/sdrbase/commands/command.cpp
index a6b83dff8..8d98c9c8c 100644
--- a/sdrbase/commands/command.cpp
+++ b/sdrbase/commands/command.cpp
@@ -203,7 +203,8 @@ void Command::run(const QString& apiAddress, int apiPort, int deviceSetIndex)
 
     m_currentProcess->setProcessChannelMode(QProcess::MergedChannels);
     m_currentProcessStartTimeStampms = TimeUtil::nowms();
-    m_currentProcess->start(m_currentProcessCommandLine);
+    QStringList allArgs = args.split(" ", Qt::SkipEmptyParts);
+    m_currentProcess->start(m_command, allArgs);
 }
 
 void Command::kill()
diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html
index f193d5cd2..fdd59c023 100644
--- a/sdrbase/resources/webapi/doc/html2/index.html
+++ b/sdrbase/resources/webapi/doc/html2/index.html
@@ -51634,7 +51634,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2021-12-24T20:37:17.750+01:00
+              Generated 2021-12-27T21:57:14.290+01:00
             </div>
           </div>
       </div>
diff --git a/sdrbench/test_golay2312.cpp b/sdrbench/test_golay2312.cpp
index e55d9bd65..7a9c66c5b 100644
--- a/sdrbench/test_golay2312.cpp
+++ b/sdrbench/test_golay2312.cpp
@@ -37,8 +37,8 @@ void MainBench::testGolay2312()
     if (codeword != expectedCodeword)
     {
         qDebug() << "MainBench::testGolay2312:"
-            << "encoder mismatch: got:" << oct << codeword
-            << "expected:" << oct << expectedCodeword;
+            << "encoder mismatch: got:" << Qt::oct << codeword
+            << "expected:" << Qt::oct << expectedCodeword;
         success = false;
     }
 
@@ -54,8 +54,8 @@ void MainBench::testGolay2312()
     else if (rxCodeword != codeword)
     {
         qDebug() << "MainBench::testGolay2312:"
-            << "decoder mismatch (no error): got:" << oct << rxCodeword
-            << "expected:" << oct << codeword;
+            << "decoder mismatch (no error): got:" << Qt::oct << rxCodeword
+            << "expected:" << Qt::oct << codeword;
         success = false;
     }
 
@@ -72,8 +72,8 @@ void MainBench::testGolay2312()
     else if (rxCodeword != codeword)
     {
         qDebug() << "MainBench::testGolay2312:"
-            << "decoder mismatch (parity[1]): got:" << oct << rxCodeword
-            << "expected:" << oct << codeword;
+            << "decoder mismatch (parity[1]): got:" << Qt::oct << rxCodeword
+            << "expected:" << Qt::oct << codeword;
         success = false;
     }
 
@@ -90,8 +90,8 @@ void MainBench::testGolay2312()
     else if (rxCodeword != codeword)
     {
         qDebug() << "MainBench::testGolay2312:"
-            << "decoder mismatch (parity[1,3]): got:" << oct << rxCodeword
-            << "expected:" << oct << codeword;
+            << "decoder mismatch (parity[1,3]): got:" << Qt::oct << rxCodeword
+            << "expected:" << Qt::oct << codeword;
         success = false;
     }