diff --git a/3rdparty/lzma.cmake b/3rdparty/lzma.cmake
index 6ff0b20..10051a4 100644
--- a/3rdparty/lzma.cmake
+++ b/3rdparty/lzma.cmake
@@ -3,6 +3,8 @@ project(lzma C ASM)
 set("LZMA_C_DIRECTORY" "lzma-21.03beta/C")
 set("LZMA_ASM_DIRECTORY" "lzma-21.03beta/Asm")
 
+message(STATUS "LZMA VERSION: 21.03beta")
+
 add_library(lzma STATIC)
 
 if(NOT "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW" OR (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" AND NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64"))
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10af421..a32b32d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,8 +30,12 @@ else()
     set(CMAKE_C_STANDARD 90)
 endif()
 
-if("${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW" AND ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "aarch64" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm"))
-    set(WIN32 TRUE)
+if("${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW")
+    if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "aarch64" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")
+        set(WIN32 TRUE)
+    endif()
+
+    add_link_options(-static-libgcc)
 endif()
 
 message("Detected system processor: ${CMAKE_SYSTEM_PROCESSOR}")
diff --git a/flac.c b/flac.c
index 9b4c5e9..1615680 100644
--- a/flac.c
+++ b/flac.c
@@ -29,7 +29,6 @@ AARU_EXPORT size_t AARU_CALL flac_decode_redbook_buffer(uint8_t*       dst_buffe
     FLAC__StreamDecoder*          decoder;
     FLAC__StreamDecoderInitStatus init_status;
     aaru_flac_ctx*                ctx = (aaru_flac_ctx*)malloc(sizeof(aaru_flac_ctx));
-    FLAC__bool                    ok  = true;
     size_t                        ret_size;
 
     memset(ctx, 0, sizeof(aaru_flac_ctx));
@@ -62,7 +61,7 @@ AARU_EXPORT size_t AARU_CALL flac_decode_redbook_buffer(uint8_t*       dst_buffe
     }
 
     // TODO: Return error somehow
-    ok = FLAC__stream_decoder_process_until_end_of_stream(decoder);
+    FLAC__stream_decoder_process_until_end_of_stream(decoder);
 
     FLAC__stream_decoder_delete(decoder);