diff --git a/src/opcua/ua_server.cpp b/src/opcua/ua_server.cpp
index a3192b0fb8818a7368739cf74fc5d314cb6da7a0..29632ef3034f611cbc25418a951dda877ed381c1 100644
--- a/src/opcua/ua_server.cpp
+++ b/src/opcua/ua_server.cpp
@@ -326,10 +326,7 @@ static UA_StatusCode ua_write_DataSource(UA_Server *server,
         if (data->hasValue) {
             unsigned int array_length = 1;
             uint32_t *data_sdp = new uint32_t[array_length];
-            // unsigned int *data_sdp = new unsigned int[array_length];
-            //CMData cm = CMData(array_length);
-            //cm.clear();
-
+            
             switch (ntype.identifier.numeric - 1) {
                 case UA_TYPES_STRING: {
                     retval = false;
diff --git a/src/periph/fpga.cpp b/src/periph/fpga.cpp
index 979d63c9cf1cebe1a096b0bd69524763c57f6065..a32002def23caa2c52a0bac9e6b23feeff3996bf 100644
--- a/src/periph/fpga.cpp
+++ b/src/periph/fpga.cpp
@@ -985,7 +985,7 @@ bool Periph_fpga::read_sst_offload_weighted_subbands(TermOutput& termout, int fo
 
 bool Periph_fpga::write_sst_offload_weighted_subbands(uint32_t *data)
 {
-    uint32_t *reg = new uint32_t[2];
+    uint32_t *reg = new uint32_t[1];
     reg[0] = 0;
     if (data[0] == 0) reg[0] = 1;
     bool retval = Write("mm/0/REG_DP_SELECTOR/0/input_select", reg);
@@ -1146,7 +1146,7 @@ bool Periph_fpga::read_bst_offload_enable(TermOutput& termout, int format)
         if (Read(regname, data) == false) {
            retval = false;
         }
-        
+
         bool select = (bool)data[0];
         *_ptr = select;
         _ptr++;
diff --git a/src/tools/mmap.cpp b/src/tools/mmap.cpp
index 913f54622ded53dd0ee1b463d1067dda2909e3da..eed1055d5ecc9a67a0625edfa30f1b1d44483749 100644
--- a/src/tools/mmap.cpp
+++ b/src/tools/mmap.cpp
@@ -105,7 +105,7 @@ CMMap mmap_to_regmap(istringstream& iss)
     mm_info_t mm_info;
     mm_info_t last_mm_info;
 
-    unsigned long long start_addr44;
+    uint64_t start_addr44;  // 64bit value, but first 44 bits are used for address.
 
     int mm_mask_hi, mm_mask_lo;
     int user_mask_hi, user_mask_lo;