diff --git a/Controllers/CoolerMasterController/RGBController_CMR6000Controller.cpp b/Controllers/CoolerMasterController/RGBController_CMR6000Controller.cpp
index 1fbbb718..298b3471 100644
--- a/Controllers/CoolerMasterController/RGBController_CMR6000Controller.cpp
+++ b/Controllers/CoolerMasterController/RGBController_CMR6000Controller.cpp
@@ -87,7 +87,7 @@ RGBController_CMR6000Controller::RGBController_CMR6000Controller(CMR6000Controll
         Rainbow.speed               = MR6000_RAINBOW_SPEED_NORMAL;
         Rainbow.speed_max           = MR6000_RAINBOW_SPEED_FASTEST;
         Rainbow.color_mode          = MODE_COLORS_NONE;
-        Rainbow.speed               = MR6000_CYCLE_SPEED_NORMAL;
+        Rainbow.speed               = MR6000_RAINBOW_SPEED_NORMAL;
         Rainbow.brightness_min      = 0x00;
         Rainbow.brightness_max      = 0xFF;
         Rainbow.brightness          = 0xFF;
diff --git a/Controllers/GigabyteSuperIORGBController/RGBController_GigabyteSuperIORGB.cpp b/Controllers/GigabyteSuperIORGBController/RGBController_GigabyteSuperIORGB.cpp
index 8e34bc4a..f87d6c9d 100644
--- a/Controllers/GigabyteSuperIORGBController/RGBController_GigabyteSuperIORGB.cpp
+++ b/Controllers/GigabyteSuperIORGBController/RGBController_GigabyteSuperIORGB.cpp
@@ -101,29 +101,29 @@ RGBController_GigabyteSuperIORGB::RGBController_GigabyteSuperIORGB(GigabyteSuper
     mode Static;
     Static.name          = "Static";
     Static.value         = GIGABYTE_MODE1_STATIC;
-    Direct.flags         = MODE_FLAG_HAS_PER_LED_COLOR;
-    Direct.color_mode    = MODE_COLORS_PER_LED;
+    Static.flags         = MODE_FLAG_HAS_PER_LED_COLOR;
+    Static.color_mode    = MODE_COLORS_PER_LED;
     modes.push_back(Static);
 
     mode Rainbow;
     Rainbow.name         = "Rainbow";
     Rainbow.value        = GIGABYTE_MODE1_RAINBOW;
-    Direct.flags         = MODE_FLAG_HAS_PER_LED_COLOR;
-    Direct.color_mode    = MODE_COLORS_PER_LED;
+    Rainbow.flags         = MODE_FLAG_HAS_PER_LED_COLOR;
+    Rainbow.color_mode    = MODE_COLORS_PER_LED;
     modes.push_back(Rainbow);
 
     mode Breathing;
     Breathing.name       = "Breathing";
     Breathing.value      = GIGABYTE_MODE1_BREATHING;
-    Direct.flags         = MODE_FLAG_HAS_PER_LED_COLOR;
-    Direct.color_mode    = MODE_COLORS_PER_LED;
+    Breathing.flags         = MODE_FLAG_HAS_PER_LED_COLOR;
+    Breathing.color_mode    = MODE_COLORS_PER_LED;
     modes.push_back(Breathing);
 
     mode Flashing;
     Flashing.name        = "Flashing";
     Flashing.value       = GIGABYTE_MODE1_FLASHING;
-    Direct.flags         = MODE_FLAG_HAS_PER_LED_COLOR;
-    Direct.color_mode    = MODE_COLORS_PER_LED;
+    Flashing.flags         = MODE_FLAG_HAS_PER_LED_COLOR;
+    Flashing.color_mode    = MODE_COLORS_PER_LED;
     modes.push_back(Flashing);
 
     SetupZones();
diff --git a/Controllers/SapphireGPUController/SapphireNitroGlowV3Controller.cpp b/Controllers/SapphireGPUController/SapphireNitroGlowV3Controller.cpp
index 2a2ce7d5..83d20f60 100644
--- a/Controllers/SapphireGPUController/SapphireNitroGlowV3Controller.cpp
+++ b/Controllers/SapphireGPUController/SapphireNitroGlowV3Controller.cpp
@@ -74,7 +74,7 @@ void SapphireNitroGlowV3Controller::SetExternalControl(bool enabled)
 
 unsigned char SapphireNitroGlowV3Controller::GetBrightness()
 {
-    return(bus->i2c_smbus_read_byte_data(dev, SAPPHIRE_NITRO_GLOW_V3_REG_MODE));
+    return(bus->i2c_smbus_read_byte_data(dev, SAPPHIRE_NITRO_GLOW_V3_REG_BRIGHTNESS));
 }
 
 void SapphireNitroGlowV3Controller::SetBrightness(unsigned char brightness)