diff --git a/keyboards/ergodox/ez/config.h b/keyboards/ergodox/ez/config.h
index 6a8c66d7d..e4f95c302 100644
--- a/keyboards/ergodox/ez/config.h
+++ b/keyboards/ergodox/ez/config.h
@@ -49,7 +49,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 255
 #define RGBLIGHT_VAL_STEP 12
 
-#define RGB_MIDI
+// #define RGB_MIDI
 #define RGBW_BB_TWI
 
 #define RGBW 1
diff --git a/keyboards/ergodox/ez/ez.c b/keyboards/ergodox/ez/ez.c
index 039e4c6bb..3e19f2302 100644
--- a/keyboards/ergodox/ez/ez.c
+++ b/keyboards/ergodox/ez/ez.c
@@ -52,9 +52,9 @@ uint8_t init_mcp23018(void) {
 
     // I2C subsystem
 
-    uint8_t sreg_prev;
-    sreg_prev=SREG;
-    cli();
+    // uint8_t sreg_prev;
+    // sreg_prev=SREG;
+    // cli();
     if (i2c_initialized == 0) {
         i2c_init();  // on pins D(1,0)
         i2c_initialized++;
@@ -83,7 +83,7 @@ uint8_t init_mcp23018(void) {
 out:
     i2c_stop();
 
-    SREG=sreg_prev;
+    // SREG=sreg_prev;
 
     return mcp23018_status;
 }
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c
index ca68bef6c..1e2648bff 100644
--- a/quantum/process_keycode/process_music.c
+++ b/quantum/process_keycode/process_music.c
@@ -114,6 +114,7 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
             music_sequence_interval+=10;
         return false;
       }
+      #define MUSIC_MODE_GUITAR
 
       #ifdef MUSIC_MODE_CHROMATIC
       float freq = ((float)220.0)*pow(2.0, -5.0)*pow(2.0,(music_starting_note + record->event.key.col + music_offset)/12.0+(MATRIX_ROWS - record->event.key.row));