diff --git a/README.md b/README.md
index e09b8da..4457cd9 100644
--- a/README.md
+++ b/README.md
@@ -8,21 +8,19 @@ Initial layout version:
 
 ## Build
 
-- Clone the QMK fork above,
+- Clone the QMK fork above, and set branch to firmware21 if it is not the
+  default branch
 - Follow the installation instructions given here:
     - <https://docs.qmk.fm/>
     - <https://docs.qmk.fm/#/newbs_getting_started?id=set-up-your-environment>
-- Make a link or copy the keymap from this repo to the corresponding
-  directory in the `qmk_firmware` cloned above.
-- From the root of the `qmk_firmware` directory, `make
-  moonlander:sroccaserra` to build the firmware.
+- Make a link or copy the keymap from this repo to the corresponding directory
+  in the `qmk_firmware` cloned above.
+- From the root of the `qmk_firmware` directory, `make moonlander:sroccaserra`
+  to build the firmware.
 - `make moonlander:sroccaserra:flash` to flash the firmware.
 
 ## Combos
 
-For firmware 20, updating `COMBO_COUNT` in config.h is still necessary. It
-won't be needed anymore with firmware 21. (See PR below.)
-
 - <https://docs.qmk.fm/#/keycodes>
 - <https://github.com/qmk/qmk_firmware/blob/master/docs/feature_combo.md>
 - <https://github.com/qmk/qmk_firmware/pull/8591>
diff --git a/moonlander/keymaps/sroccaserra/config.h b/moonlander/keymaps/sroccaserra/config.h
index e985d55..938f2bf 100644
--- a/moonlander/keymaps/sroccaserra/config.h
+++ b/moonlander/keymaps/sroccaserra/config.h
@@ -12,8 +12,5 @@
 #define FIRMWARE_VERSION u8"jXKZa/mDJvX"
 #define RGB_MATRIX_STARTUP_SPD 60
 
-// Note: COMBO_COUNT will no longer be needed with firmware 21, see:
-// - https://github.com/qmk/qmk_firmware/pull/8591
-#define COMBO_COUNT 2
 #define COMBO_TERM 40
 #define COMBO_PERMISSIVE_HOLD
diff --git a/moonlander/keymaps/sroccaserra/keymap.c b/moonlander/keymaps/sroccaserra/keymap.c
index d3ff4ba..c2dd3c1 100644
--- a/moonlander/keymaps/sroccaserra/keymap.c
+++ b/moonlander/keymaps/sroccaserra/keymap.c
@@ -43,9 +43,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
   [1] = LAYOUT_moonlander(
     RESET,          KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
-    KC_TRANSPARENT, FR_CIRC,        FR_EACU,        FR_DQUO,        FR_APOS,        KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, FR_GRV,         FR_EGRV,        FR_UGRV,        FR_CCED,        FR_AGRV,        KC_TRANSPARENT,
+    KC_TRANSPARENT, FR_CIRC,        FR_EACU,        FR_DQUO,        FR_QUOT,        KC_TRANSPARENT, KC_TRANSPARENT,                                 KC_TRANSPARENT, FR_GRV,         FR_EGRV,        FR_UGRV,        FR_CCED,        FR_AGRV,        KC_TRANSPARENT,
     KC_TRANSPARENT, FR_MINS,        FR_DLR,         FR_LPRN,        FR_RPRN,        KC_TRANSPARENT, KC_TRANSPARENT,                                                                 KC_TRANSPARENT, FR_HASH,        FR_LCBR,        FR_RCBR,        FR_ASTR,        FR_UNDS,        KC_TRANSPARENT,
-    KC_TRANSPARENT, FR_AT,          FR_AMP,         FR_LESS,        FR_GRTR,        KC_TRANSPARENT,                                 KC_TRANSPARENT, FR_LBRC,        FR_RBRC,        FR_PERC,        FR_EXLM,        KC_TRANSPARENT,
+    KC_TRANSPARENT, FR_AT,          FR_AMPR,        FR_LABK,        FR_RABK,        KC_TRANSPARENT,                                 KC_TRANSPARENT, FR_LBRC,        FR_RBRC,        FR_PERC,        FR_EXLM,        KC_TRANSPARENT,
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                                                                                                 KC_TRANSPARENT, MO(4),          KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
     KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,                 KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
   ),
@@ -123,7 +123,7 @@ void set_layer_color(int layer) {
 }
 
 void rgb_matrix_indicators_user(void) {
-  if (g_suspend_state || keyboard_config.disable_layer_led) { return; }
+  if (keyboard_config.disable_layer_led) { return; }
   switch (biton32(layer_state)) {
     case 0:
       set_layer_color(0);