diff --git a/KeyboardLayoutManager/KeyboardLayoutManager.cpp b/KeyboardLayoutManager/KeyboardLayoutManager.cpp
index 35ff629f..06a5071f 100644
--- a/KeyboardLayoutManager/KeyboardLayoutManager.cpp
+++ b/KeyboardLayoutManager/KeyboardLayoutManager.cpp
@@ -852,8 +852,6 @@ void KeyboardLayoutManager::AddAltName(keyboard_led key)
     \*---------------------------------------------------------------------*/
     unsigned int    edit_row        = key.row;
     unsigned int    edit_col        = key.col;
-    const char*     edit_name       = key.name;
-    unsigned int    edit_value      = key.value;
     const char*     edit_alt_name   = key.alt_name;
 
     /*---------------------------------------------------------------------*\
diff --git a/RGBController/RGBController.cpp b/RGBController/RGBController.cpp
index a67fa86f..831c539e 100644
--- a/RGBController/RGBController.cpp
+++ b/RGBController/RGBController.cpp
@@ -282,7 +282,7 @@ unsigned char * RGBController::GetDeviceDescription(unsigned int protocol_versio
         /*-----------------------------------------------------*\
         | LED alternate name strings                            |
         \*-----------------------------------------------------*/
-        for(int led_idx = 0; led_idx < led_alt_names.size(); led_idx++)
+        for(std::size_t led_idx = 0; led_idx < led_alt_names.size(); led_idx++)
         {
             data_size += sizeof(unsigned short);
             data_size += strlen(led_alt_names[led_idx].c_str()) + 1;
@@ -725,7 +725,7 @@ unsigned char * RGBController::GetDeviceDescription(unsigned int protocol_versio
         memcpy(&data_buf[data_ptr], &num_led_alt_names, sizeof(num_led_alt_names));
         data_ptr += sizeof(num_led_alt_names);
 
-        for(int led_idx = 0; led_idx < led_alt_names.size(); led_idx++)
+        for(std::size_t led_idx = 0; led_idx < led_alt_names.size(); led_idx++)
         {
             /*---------------------------------------------------------*\
             | Copy in LED alternate name (size+data)                    |
diff --git a/qt/DeviceView.cpp b/qt/DeviceView.cpp
index 758bdf97..1131854a 100644
--- a/qt/DeviceView.cpp
+++ b/qt/DeviceView.cpp
@@ -1033,7 +1033,7 @@ bool DeviceView::selectZone(int zone, bool add)
 
     int zoneStart = controller->zones[zone].start_idx;
 
-    for(int led_idx = 0; led_idx < controller->GetLEDsInZone(zone); led_idx++)
+    for(std::size_t led_idx = 0; led_idx < controller->GetLEDsInZone(zone); led_idx++)
     {
         if(!selectionFlags[zoneStart + led_idx])
         {