diff --git a/companion/src/downloaddialog.cpp b/companion/src/downloaddialog.cpp
index d5c037645..5b9b2dfa0 100644
--- a/companion/src/downloaddialog.cpp
+++ b/companion/src/downloaddialog.cpp
@@ -114,7 +114,7 @@ void DownloadDialog::updateDataReadProgress(qint64 bytesRead, qint64 totalBytes)
 void DownloadDialog::fileError()
 {
   delete file;
-  file = NULL;
+  file = nullptr;
   reject();
 }
 
diff --git a/companion/src/flashfirmwaredialog.cpp b/companion/src/flashfirmwaredialog.cpp
index fd6046f92..4650cd4c0 100644
--- a/companion/src/flashfirmwaredialog.cpp
+++ b/companion/src/flashfirmwaredialog.cpp
@@ -21,7 +21,6 @@
 #include "flashfirmwaredialog.h"
 #include "ui_flashfirmwaredialog.h"
 #include "appdata.h"
-#include "process_flash.h"
 #include "helpers.h"
 #include "progressdialog.h"
 #include "radiointerface.h"
@@ -202,7 +201,7 @@ void FlashFirmwareDialog::on_useExternalSplash_clicked()
 void FlashFirmwareDialog::on_useLibrarySplash_clicked()
 {
   QString fileName;
-  SplashLibraryDialog *ld = new SplashLibraryDialog(this, &fileName);
+  auto ld = new SplashLibraryDialog(this, &fileName);
   ld->exec();
   if (!fileName.isEmpty()) {
     QImage image(fileName);
diff --git a/companion/src/storage/firmwareinterface.h b/companion/src/storage/firmwareinterface.h
index 2912ec6ff..d6dee286b 100644
--- a/companion/src/storage/firmwareinterface.h
+++ b/companion/src/storage/firmwareinterface.h
@@ -39,7 +39,7 @@
 class FirmwareInterface
 {
   public:
-    FirmwareInterface(const QString &filename);
+    FirmwareInterface(const QString & filename);
     inline QString getDate() { return date; }
     inline QString getTime() { return time; }
     int getSize() { return flashSize; }
diff --git a/radio/src/stamp.cpp b/radio/src/stamp.cpp
index 31deb5486..e8b67bdff 100644
--- a/radio/src/stamp.cpp
+++ b/radio/src/stamp.cpp
@@ -45,7 +45,7 @@
 #endif
 
 #if defined(COLORLCD)
-  const char vers_stamp[]  =   "VERS" TAB ": " "opentx-" FLAVOUR "-" VERSION DISPLAY_VERSION " (" GIT_STR ")";
+  const char vers_stamp[]  =   "VERS" TAB ": " VERSION DISPLAY_VERSION " (" GIT_STR ")";
   const char date_stamp[]  =   "DATE" TAB ": " DATE;
   const char time_stamp[]  =   "TIME" TAB ": " TIME;
   const char eeprom_stamp[]  = "EEPR" TAB ": " EEPROM_STR;