diff --git a/firmware/application/event_m0.cpp b/firmware/application/event_m0.cpp
index 2f947870..82f0e6bd 100644
--- a/firmware/application/event_m0.cpp
+++ b/firmware/application/event_m0.cpp
@@ -281,6 +281,7 @@ void EventDispatcher::emulateTouch(ui::TouchEvent event) {
     while (injected_touch_event != nullptr) {
         chThdSleepMilliseconds(5);
     }
+    injected_touch_event = nullptr;  // to clean event_mo.cpp, compile warning error : "storing the address of local variable 'event' in 'this_4(D)->injected_touch_event' [-Wdangling-pointer=]"
 }
 
 void EventDispatcher::emulateKeyboard(ui::KeyboardEvent event) {
@@ -288,6 +289,7 @@ void EventDispatcher::emulateKeyboard(ui::KeyboardEvent event) {
     while (injected_keyboard_event != nullptr) {
         chThdSleepMilliseconds(5);
     }
+    injected_keyboard_event = nullptr;  // to clean event_mo.cpp, compile warning error : "storing the address of local variable 'event' in 'this_4(D)->injected_keyboard_event' [-Wdangling-pointer=]"
 }
 
 void EventDispatcher::on_keyboard_event(ui::KeyboardEvent event) {
diff --git a/firmware/tools/export_external_apps.py b/firmware/tools/export_external_apps.py
index b187eddb..f0216a6d 100755
--- a/firmware/tools/export_external_apps.py
+++ b/firmware/tools/export_external_apps.py
@@ -55,8 +55,12 @@ def write_image(data, path):
 
 def patch_image(path, image_data, search_address, replace_address):
 	if (len(image_data) % 4) != 0:
-		print("file size not divideable by 4")
-		sys.exit(-1)
+		#sys.exit(-1)
+		print("\n External App image file:", path, ", size not divideable by 4 :", len(image_data))
+		j=0
+		while (len(image_data) % 4) != 0:
+			image_data += b'\x00' ; j+=1
+		print("file size:", len(image_data)," after padded:",j, "bytes")
 
 	external_application_image = bytearray()