diff --git a/Makefile b/Makefile
index 19b468655..8284adfa4 100644
--- a/Makefile
+++ b/Makefile
@@ -112,7 +112,7 @@ include quiz/Makefile # Quiz needs to be included at the end
 all_src = $(apps_src) $(escher_src) $(ion_src) $(kandinsky_src) $(liba_src) $(libaxx_src) $(poincare_src) $(python_src) $(runner_src) $(ion_device_flasher_src) $(ion_device_bench_src) $(tests_src)
 # Make palette.h a dep for every source-file.
 # This ensures that the theming engine works correctly.
-$(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/escher/palette.h
+$(call object_for,$(all_src)): $(BUILD_DIR)/escher/palette.h
 
 all_objs = $(call object_for,$(all_src))
 .SECONDARY: $(all_objs)
diff --git a/apps/external/extapp_api.cpp b/apps/external/extapp_api.cpp
index 248fc6ee2..eefd19f58 100644
--- a/apps/external/extapp_api.cpp
+++ b/apps/external/extapp_api.cpp
@@ -269,7 +269,7 @@ int extapp_getKey(bool allowSuspend, bool *alphaWasActive) {
       continue;
     }
     if (event.isKeyboardEvent()) {
-      key = event.id();
+      key = static_cast<uint8_t>(event);
       if (key == 17 || key == 4 || key == 5 || key == 52) {
         extapp_resetKeyboard();
       }