diff --git a/cmake/FindArgon2.cmake b/cmake/FindArgon2.cmake
index c0fb53b4..bb2f5811 100644
--- a/cmake/FindArgon2.cmake
+++ b/cmake/FindArgon2.cmake
@@ -21,7 +21,9 @@ if (MINGW)
   message(STATUS "Patching libargon2...\n")
   execute_process(COMMAND objcopy
               --redefine-sym argon2_hash=libargon2_argon2_hash
+              --redefine-sym _argon2_hash=_libargon2_argon2_hash
               --redefine-sym argon2_error_message=libargon2_argon2_error_message
+              --redefine-sym _argon2_error_message=_libargon2_argon2_error_message
               ${ARGON2_SYS_LIBRARIES} ${CMAKE_BINARY_DIR}/libargon2_patched.a
           WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
   find_library(ARGON2_LIBRARIES libargon2_patched.a PATHS ${CMAKE_BINARY_DIR} NO_DEFAULT_PATH)
diff --git a/snapcraft.yaml b/snapcraft.yaml
index f4b90661..70117418 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -28,6 +28,7 @@ parts:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
       - -DKEEPASSXC_DIST_TYPE=Snap
+      - -DKEEPASSXC_BUILD_TYPE=Release
       - -DWITH_TESTS=OFF
       - -DWITH_XC_ALL=ON
     build-packages: