diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 1d3bd75a3..2c493647b 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -2307,6 +2307,7 @@ void DivEngine::noteToSplitNote(short note, short& outNote, short& outOctave) {
     case -1:
       outNote=0;
       outOctave=0;
+      break;
     default:
       outNote=note%12;
       outOctave=(unsigned char)(note-60)/12;
diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp
index eb8f9a4f3..9df1f6899 100644
--- a/src/engine/playback.cpp
+++ b/src/engine/playback.cpp
@@ -321,7 +321,7 @@ const char* cmdName[]={
 static_assert((sizeof(cmdName)/sizeof(void*))==DIV_CMD_MAX,"update cmdName!");
 
 const char* formatNote(short note) {
-  static char ret[4];
+  static char ret[16];
   if (note==DIV_NOTE_OFF) {
     return "OFF";
   } else if (note==DIV_NOTE_REL) {
@@ -331,7 +331,7 @@ const char* formatNote(short note) {
   } else if (note<0) {
     return "---";
   }
-  snprintf(ret,4,"%s%d",notes[note%12],(note-60)/12);
+  snprintf(ret,16,"%s%d",notes[note%12],(note-60)/12);
   return ret;
 }