diff --git a/drivers/led/apa102.c b/drivers/led/apa102.c
index 050609263d5..6e87d48b968 100644
--- a/drivers/led/apa102.c
+++ b/drivers/led/apa102.c
@@ -122,7 +122,7 @@ void apa102_init(void) {
     gpio_set_pin_output(APA102_CI_PIN);
 }
 
-void apa102_set_color(uint16_t index, uint8_t red, uint8_t green, uint8_t blue) {
+void apa102_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     apa102_leds[index].r = red;
     apa102_leds[index].g = green;
     apa102_leds[index].b = blue;
diff --git a/drivers/led/apa102.h b/drivers/led/apa102.h
index 42f1344f0c9..6fa3521a3a5 100644
--- a/drivers/led/apa102.h
+++ b/drivers/led/apa102.h
@@ -32,7 +32,7 @@
 #define APA102_MAX_BRIGHTNESS 31
 
 void apa102_init(void);
-void apa102_set_color(uint16_t index, uint8_t red, uint8_t green, uint8_t blue);
+void apa102_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
 void apa102_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
 void apa102_flush(void);
 
diff --git a/quantum/process_keycode/process_underglow.c b/quantum/process_keycode/process_underglow.c
index 6104cd02c6c..b8d8989ef34 100644
--- a/quantum/process_keycode/process_underglow.c
+++ b/quantum/process_keycode/process_underglow.c
@@ -16,7 +16,10 @@
 
 bool process_underglow(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
-        uint8_t shifted = get_mods() & MOD_MASK_SHIFT;
+#if defined(RGBLIGHT_ENABLE) || (defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_SHARED_KEYCODES))
+        const uint8_t shifted = get_mods() & MOD_MASK_SHIFT;
+#endif
+
         switch (keycode) {
             case QK_UNDERGLOW_TOGGLE:
 #if defined(RGBLIGHT_ENABLE)