diff --git a/android/app/build.gradle b/android/app/build.gradle
index ed4054db..5c167eee 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -14,7 +14,7 @@ android {
 
         externalNativeBuild {
             cmake {
-                arguments "-DOPT_BACKEND_GLFW=OFF", "-DOPT_BACKEND_ANDROID=ON", "-DOPT_BUILD_SOAPY_SOURCE=OFF", "-DOPT_BUILD_ANDROID_AUDIO_SINK=ON", "-DOPT_BUILD_AUDIO_SINK=OFF", "-DOPT_BUILD_DISCORD_PRESENCE=OFF", "-DUSE_INTERNAL_LIBCORRECT=OFF"
+                arguments "-DOPT_BACKEND_GLFW=OFF", "-DOPT_BACKEND_ANDROID=ON", "-DOPT_BUILD_SOAPY_SOURCE=OFF", "-DOPT_BUILD_ANDROID_AUDIO_SINK=ON", "-DOPT_BUILD_AUDIO_SINK=OFF", "-DOPT_BUILD_DISCORD_PRESENCE=OFF", "-DOPT_BUILD_M17_DECODER=ON"
             }
         }
     }
diff --git a/core/libcorrect/CMakeLists.txt b/core/libcorrect/CMakeLists.txt
index 59580b73..7fce281d 100644
--- a/core/libcorrect/CMakeLists.txt
+++ b/core/libcorrect/CMakeLists.txt
@@ -17,8 +17,14 @@ if(COMPILER_SUPPORTS_WPEDANTIC)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpedantic")
 endif()
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3 -O0 -fsanitize=address")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_pie,")
+    # On android, keep optimisations and don't use asan
+    if (ANDROID)
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3 -O3")
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,")
+    else()
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3 -O0 -fsanitize=address")
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_pie,")
+    endif()
 else()
   if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
diff --git a/core/src/core.cpp b/core/src/core.cpp
index 898fc309..211d69a9 100644
--- a/core/src/core.cpp
+++ b/core/src/core.cpp
@@ -260,6 +260,8 @@ int sdrpp_main(int argc, char* argv[]) {
     core::configManager.conf["modules"][modCount++] = "network_sink.so";
     core::configManager.conf["modules"][modCount++] = "audio_sink.so";
 
+    core::configManager.conf["modules"][modCount++] = "m17_decoder.so";
+    core::configManager.conf["modules"][modCount++] = "meteor_demodulator.so";
     core::configManager.conf["modules"][modCount++] = "radio.so";
 
     core::configManager.conf["modules"][modCount++] = "frequency_manager.so";
diff --git a/core/src/core.h b/core/src/core.h
index 0c171d50..0305e783 100644
--- a/core/src/core.h
+++ b/core/src/core.h
@@ -1,7 +1,6 @@
 #pragma once
 #include <config.h>
 #include <module.h>
-#include <module.h>
 #include <module_com.h>
 #include "command_args.h"
 
diff --git a/decoder_modules/m17_decoder/CMakeLists.txt b/decoder_modules/m17_decoder/CMakeLists.txt
index 7fd7879c..4b445789 100644
--- a/decoder_modules/m17_decoder/CMakeLists.txt
+++ b/decoder_modules/m17_decoder/CMakeLists.txt
@@ -26,13 +26,13 @@ if (MSVC)
 elseif (ANDROID)
     target_include_directories(m17_decoder PUBLIC
         /mnt/android_sdr/codec2/src
-        /mnt/android_sdr/codec2/build_${ANDROID_ABI}/
+        /mnt/android_sdr/output/codec2/${ANDROID_ABI}/
     )
 
     target_link_libraries(m17_decoder PUBLIC
         /mnt/android_sdr/output/codec2/${ANDROID_ABI}/libcodec2.so
     )
-else (MSVC)
+else ()
     find_package(PkgConfig)
 
     pkg_check_modules(LIBCODEC2 REQUIRED codec2)