diff --git a/Controllers/PowerColorGPUController/PowerColorRedDevilV2Controller/PowerColorRedDevilV2Controller.h b/Controllers/PowerColorGPUController/PowerColorRedDevilV2Controller/PowerColorRedDevilV2Controller.h
index 63b614480..64262da2a 100644
--- a/Controllers/PowerColorGPUController/PowerColorRedDevilV2Controller/PowerColorRedDevilV2Controller.h
+++ b/Controllers/PowerColorGPUController/PowerColorRedDevilV2Controller/PowerColorRedDevilV2Controller.h
@@ -9,12 +9,12 @@
 |   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/
 
+#pragma once
+
 #include <string>
 #include "i2c_smbus.h"
 #include "RGBController.h"
 
-#pragma once
-
 typedef unsigned char   red_devil_v2_dev_id;
 
 struct red_devil_v2_mode
diff --git a/Controllers/PowerColorGPUController/PowerColorRedDevilV2Controller/RGBController_PowerColorRedDevilV2.cpp b/Controllers/PowerColorGPUController/PowerColorRedDevilV2Controller/RGBController_PowerColorRedDevilV2.cpp
index 113213472..730df8d54 100644
--- a/Controllers/PowerColorGPUController/PowerColorRedDevilV2Controller/RGBController_PowerColorRedDevilV2.cpp
+++ b/Controllers/PowerColorGPUController/PowerColorRedDevilV2Controller/RGBController_PowerColorRedDevilV2.cpp
@@ -9,8 +9,6 @@
 |   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/
 
-#pragma once
-
 #include "RGBController.h"
 #include "RGBController_PowerColorRedDevilV2.h"
 
@@ -262,7 +260,7 @@ void RGBController_PowerColorRedDevilV2::DeviceUpdateLEDs()
     | single register write instead of writing to each LED      |
     \*---------------------------------------------------------*/
     bool all_same = true;
-    for(int i = 1; i < colors.size(); i++)
+    for(std::size_t i = 1; i < colors.size(); i++)
     {
         if(colors[i-1] != colors[i])
         {
@@ -285,11 +283,11 @@ void RGBController_PowerColorRedDevilV2::DeviceUpdateLEDs()
         | Since writing to each LED is slow check which colors have |
         | changed and only write those instead                      |
         \*---------------------------------------------------------*/
-        for(int i = 0; i < colors.size(); i++)
+        for(std::size_t i = 0; i < colors.size(); i++)
         {
             if(colors[i] != colors_copy[i])
             {
-                controller->SetLedColor(i, colors[i]);
+                controller->SetLedColor((int)i, colors[i]);
             }
         }
     }
@@ -325,9 +323,9 @@ void RGBController_PowerColorRedDevilV2::ReadConfig()
     red_devil_v2_mode mode  = controller->GetMode();
     bool sync               = controller->GetSync();
 
-    for(int i = 0; i < colors.size(); i++)
+    for(std::size_t i = 0; i < colors.size(); i++)
     {
-        colors[i] = controller->GetLedColor(i);
+        colors[i] = controller->GetLedColor((int)i);
     }
 
     /*---------------------------------------------------------*\
@@ -348,4 +346,4 @@ void RGBController_PowerColorRedDevilV2::ReadConfig()
 
     modes[active_mode].brightness   = mode.brightness;
     modes[active_mode].speed        = mode.speed;
-}
\ No newline at end of file
+}
diff --git a/Controllers/StreamDeckController/ElgatoStreamDeckController.cpp b/Controllers/StreamDeckController/ElgatoStreamDeckController.cpp
index 1fabf0b92..13b6cf1d5 100644
--- a/Controllers/StreamDeckController/ElgatoStreamDeckController.cpp
+++ b/Controllers/StreamDeckController/ElgatoStreamDeckController.cpp
@@ -50,7 +50,7 @@ void ElgatoStreamDeckController::SendFullFrame(const std::vector<std::vector<uns
 {
     for(int btnIdx = 0; btnIdx < 15; btnIdx++)
     {
-        if(btnIdx < buttonImages.size())
+        if(btnIdx < (int)buttonImages.size())
         {
             SendButtonImage(btnIdx, buttonImages[btnIdx]);
         }
diff --git a/Controllers/StreamDeckController/RGBController_ElgatoStreamDeck.cpp b/Controllers/StreamDeckController/RGBController_ElgatoStreamDeck.cpp
index f492a93bb..05f08e96b 100644
--- a/Controllers/StreamDeckController/RGBController_ElgatoStreamDeck.cpp
+++ b/Controllers/StreamDeckController/RGBController_ElgatoStreamDeck.cpp
@@ -20,7 +20,7 @@
     @direct :white_check_mark:
     @effects :x:
     @detectors DetectElgatoStreamDeckControllers
-    @comment 
+    @comment
 \*-------------------------------------------------------------------*/
 
 RGBController_ElgatoStreamDeck::RGBController_ElgatoStreamDeck(ElgatoStreamDeckController *controller_ptr) : controller(controller_ptr)
@@ -107,15 +107,22 @@ void RGBController_ElgatoStreamDeck::DeviceUpdateLEDs()
     controller->SendFullFrame(buttonImages);
 }
 
-void RGBController_ElgatoStreamDeck::UpdateZoneLEDs(int zone)
+void RGBController_ElgatoStreamDeck::UpdateZoneLEDs(int /*zone*/)
 {
     DeviceUpdateLEDs();
 }
 
-void RGBController_ElgatoStreamDeck::UpdateSingleLED(int led)
+void RGBController_ElgatoStreamDeck::UpdateSingleLED(int /*led*/)
 {
     DeviceUpdateLEDs();
 }
 
-void RGBController_ElgatoStreamDeck::ResizeZone(int, int) {}
-void RGBController_ElgatoStreamDeck::DeviceUpdateMode() {}
+void RGBController_ElgatoStreamDeck::ResizeZone(int /*zone*/, int /*new_size*/)
+{
+
+}
+
+void RGBController_ElgatoStreamDeck::DeviceUpdateMode()
+{
+
+}
diff --git a/Controllers/StreamDeckController/RGBController_ElgatoStreamDeck.h b/Controllers/StreamDeckController/RGBController_ElgatoStreamDeck.h
index b88276a23..05d823cf1 100644
--- a/Controllers/StreamDeckController/RGBController_ElgatoStreamDeck.h
+++ b/Controllers/StreamDeckController/RGBController_ElgatoStreamDeck.h
@@ -18,14 +18,16 @@ class RGBController_ElgatoStreamDeck : public RGBController
 {
 public:
     explicit RGBController_ElgatoStreamDeck(ElgatoStreamDeckController* controller_ptr);
-    ~RGBController_ElgatoStreamDeck() override;
+    ~RGBController_ElgatoStreamDeck();
 
-    void SetupZones() override;
-    void ResizeZone(int zone, int new_size) override;
-    void DeviceUpdateLEDs() override;
-    void UpdateZoneLEDs(int zone) override;
-    void UpdateSingleLED(int led) override;
-    void DeviceUpdateMode() override;
+    void SetupZones();
+    void ResizeZone(int zone, int new_size);
+
+    void DeviceUpdateLEDs();
+    void UpdateZoneLEDs(int zone);
+    void UpdateSingleLED(int led);
+
+    void DeviceUpdateMode();
 
 private:
     ElgatoStreamDeckController* controller;