diff --git a/platform/drivers/CPS/cps_io_native_GDx.c b/platform/drivers/CPS/cps_io_native_GDx.c
index 762c04a3..fecc285a 100644
--- a/platform/drivers/CPS/cps_io_native_GDx.c
+++ b/platform/drivers/CPS/cps_io_native_GDx.c
@@ -27,10 +27,10 @@
 #include "W25Qx.h"
 #include "cps_data_GDx.h"
 
-//static const uint32_t zoneBaseAddr    = 0x149e0;      /**< Base address of zones                */
+//static const uint32_t zoneBaseAddr        = 0x149e0;  /**< Base address of zones                */
+//static const uint32_t vfoChannelBaseAddr  = 0x7590;   /**< Base address of VFO channel          */
 static const uint32_t channelBaseAddrEEPROM = 0x03780;  /**< Base address of channel data         */
 static const uint32_t channelBaseAddrFlash  = 0x7b1c0;  /**< Base address of channel data         */
-static const uint32_t vfoChannelBaseAddr    = 0x7590;   /**< Base address of VFO channel          */
 static const uint32_t zoneBaseAddr          = 0x8010;   /**< Base address of zones                */
 static const uint32_t contactBaseAddr       = 0x87620;  /**< Base address of contacts             */
 static const uint32_t maxNumChannels        = 1024;     /**< Maximum number of channels in memory */
diff --git a/platform/drivers/CPS/cps_io_native_MD9600.c b/platform/drivers/CPS/cps_io_native_MD9600.c
index 30f4d581..15a7d6c4 100644
--- a/platform/drivers/CPS/cps_io_native_MD9600.c
+++ b/platform/drivers/CPS/cps_io_native_MD9600.c
@@ -27,9 +27,9 @@
 #include "cps_data_MDUV3x0.h"
 #include "W25Qx.h"
 
+//static const uint32_t vfoChannelBaseAddr = 0x2EF00; /**< Base address of VFO channel                           */
 static const uint32_t zoneBaseAddr       = 0x149E0;   /**< Base address of zones                                 */
 static const uint32_t zoneExtBaseAddr    = 0x31000;   /**< Base address of zone extensions                       */
-static const uint32_t vfoChannelBaseAddr = 0x2EF00;   /**< Base address of VFO channel                           */
 static const uint32_t chDataBaseAddr     = 0x110000;  /**< Base address of channel data                          */
 static const uint32_t contactBaseAddr    = 0x140000;  /**< Base address of contacts                              */
 static const uint32_t maxNumChannels     = 3000;      /**< Maximum number of channels in memory                  */
diff --git a/platform/drivers/NVM/nvmem_MD9600.c b/platform/drivers/NVM/nvmem_MD9600.c
index 41682f10..5262644a 100644
--- a/platform/drivers/NVM/nvmem_MD9600.c
+++ b/platform/drivers/NVM/nvmem_MD9600.c
@@ -38,6 +38,7 @@ void nvm_terminate()
 
 void nvm_readCalibData(void *buf)
 {
+    (void) buf;
     return;
 }
 
@@ -71,5 +72,6 @@ int nvm_readSettings(settings_t *settings)
 int nvm_writeSettings(const settings_t *settings)
 {
     // Disable settings write until DFU is implemented for flash backups
+    (void) settings;
     return -1;
 }