diff --git a/projects/android-project/app/jni/Android.mk b/projects/android-project/app/jni/Android.mk
index e62d070cd..dbf4aa3f7 100644
--- a/projects/android-project/app/jni/Android.mk
+++ b/projects/android-project/app/jni/Android.mk
@@ -64,7 +64,8 @@ CORE_SRCS				:= tools/ecode/*.cpp \
 							tools/ecode/plugins/autocomplete/*.cpp \
 							tools/ecode/plugins/linter/*.cpp \
 							tools/ecode/plugins/formatter/*.cpp \
-							tools/ecode/plugins/lsp/*.cpp
+							tools/ecode/plugins/lsp/*.cpp \
+							tools/ecode/plugins/xmltools/*.cpp
 
 LOCAL_SRC_FILES			:= $(SDL_MAIN_PATH) $(foreach F, $(CORE_SRCS), $(addprefix $(dir $(F)),$(notdir $(wildcard $(LOCAL_PATH)/$(F)))))
 
diff --git a/src/eepp/system/sys.cpp b/src/eepp/system/sys.cpp
index aeddbd383..2dac6b25b 100644
--- a/src/eepp/system/sys.cpp
+++ b/src/eepp/system/sys.cpp
@@ -1153,7 +1153,7 @@ bool Sys::windowAttachConsole() {
 
 #if EE_PLATFORM == EE_PLATFORM_WIN
 static void windowsSystem( const std::string& programPath ) {
-	STARTUPINFO si;
+	STARTUPINFOW si;
 	PROCESS_INFORMATION pi;
 	ZeroMemory( &si, sizeof( si ) );
 	si.cb = sizeof( si );
diff --git a/src/eepp/window/backend/SDL2/windowsdl2.cpp b/src/eepp/window/backend/SDL2/windowsdl2.cpp
index 091a0e93b..5c84693ea 100644
--- a/src/eepp/window/backend/SDL2/windowsdl2.cpp
+++ b/src/eepp/window/backend/SDL2/windowsdl2.cpp
@@ -784,6 +784,7 @@ void WindowSDL::raise() {
 
 void WindowSDL::flash( WindowFlashOperation op ) {
 #if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN
+#if SDL_VERSION_ATLEAST( 2, 0, 16 )
 	SDL_FlashOperation sdlOp = SDL_FlashOperation::SDL_FLASH_BRIEFLY;
 	if ( op == WindowFlashOperation::Cancel )
 		sdlOp = SDL_FlashOperation::SDL_FLASH_CANCEL;
@@ -791,6 +792,7 @@ void WindowSDL::flash( WindowFlashOperation op ) {
 		sdlOp = SDL_FlashOperation::SDL_FLASH_UNTIL_FOCUSED;
 	SDL_FlashWindow( mSDLWindow, sdlOp );
 #endif
+#endif
 }
 
 void WindowSDL::show() {