diff --git a/cpp/base/primary_device.h b/cpp/base/primary_device.h
index 4763d46a..9ab5e3f0 100644
--- a/cpp/base/primary_device.h
+++ b/cpp/base/primary_device.h
@@ -111,8 +111,7 @@ class PrimaryDevice : public Device
 
 protected:
 
-    PrimaryDevice(PbDeviceType type, int lun, int delay = SEND_NO_DELAY)
-    : Device(type, lun), delay_after_bytes(delay)
+    PrimaryDevice(PbDeviceType t, int l, int delay = SEND_NO_DELAY) : Device(t, l), delay_after_bytes(delay)
     {
     }
 
diff --git a/cpp/buses/in_process_bus.cpp b/cpp/buses/in_process_bus.cpp
index b1277c7c..ceedd5ff 100644
--- a/cpp/buses/in_process_bus.cpp
+++ b/cpp/buses/in_process_bus.cpp
@@ -69,8 +69,8 @@ bool InProcessBus::WaitForSelection()
     return true;
 }
 
-DelegatingInProcessBus::DelegatingInProcessBus(InProcessBus &bus, const string &name, bool log_signals) : bus(
-    bus), in_process_logger(CreateLogger(name)), log_signals(log_signals)
+DelegatingInProcessBus::DelegatingInProcessBus(InProcessBus &b, const string &name, bool l) : bus(b), in_process_logger(
+    CreateLogger(name)), log_signals(l)
 {
     // Log without timestamps
     in_process_logger->set_pattern("[%^%l%$] [%n] %v");
diff --git a/cpp/buses/in_process_bus.h b/cpp/buses/in_process_bus.h
index 338118bd..cd7de643 100644
--- a/cpp/buses/in_process_bus.h
+++ b/cpp/buses/in_process_bus.h
@@ -133,9 +133,9 @@ class DelegatingInProcessBus : public InProcessBus
     {
         return bus.GetDAT();
     }
-    void SetDAT(uint8_t dat) override
+    void SetDAT(uint8_t d) override
     {
-        bus.SetDAT(dat);
+        bus.SetDAT(d);
     }
 
     bool GetSignal(int) const override;
diff --git a/cpp/devices/storage_device.h b/cpp/devices/storage_device.h
index e3c23b4c..3f0fcc60 100644
--- a/cpp/devices/storage_device.h
+++ b/cpp/devices/storage_device.h
@@ -108,8 +108,8 @@ class StorageDevice : public PrimaryDevice
 
 protected:
 
-    StorageDevice(PbDeviceType type, int lun, bool s, bool p, const set<uint32_t> &sizes)
-    : PrimaryDevice(type, lun), supported_block_sizes(sizes), supports_mode_select(s), supports_save_parameters(p)
+    StorageDevice(PbDeviceType t, int l, bool s, bool p, const set<uint32_t> &sizes)
+    : PrimaryDevice(t, l), supported_block_sizes(sizes), supports_mode_select(s), supports_save_parameters(p)
     {
     }
 
diff --git a/cpp/devices/tap_driver.cpp b/cpp/devices/tap_driver.cpp
index d9adadae..ad16a549 100644
--- a/cpp/devices/tap_driver.cpp
+++ b/cpp/devices/tap_driver.cpp
@@ -227,7 +227,7 @@ pair<string, string> TapDriver::ExtractAddressAndMask(logger &logger) const
         }
 
         // long long is required for compatibility with 32 bit platforms
-        const auto mask = (long long)(pow(2, 32) - (1 << (32 - m)));
+        const auto mask = static_cast<long long>(pow(2, 32) - (1 << (32 - m)));
         netmask = to_string((mask >> 24) & 0xff) + '.' + to_string((mask >> 16) & 0xff) + '.' +
             to_string((mask >> 8) & 0xff) + '.' + to_string(mask & 0xff);
     }
@@ -323,7 +323,7 @@ void TapDriver::Flush(logger &logger) const
 {
     while (HasPendingPackets()) {
         array<uint8_t, ETH_FRAME_LEN> m_garbage_buffer;
-        (void)Receive(m_garbage_buffer, logger);
+        static_cast<void>(Receive(m_garbage_buffer, logger));
     }
 }