diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0df81d12839eabd78d0d6d1a63c883bb4f66586..5f06f2cbf29c948ed415bb88a79f80930a65bbea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -363,7 +363,7 @@ if(MSVC)
 
   # daemon
   set(JAMID_SRC_PATH ${DAEMON_DIR}/contrib/msvc/include)
-  set(JAMID_LIB ${DAEMON_DIR}/build/x64/ReleaseLib_win32/bin/jami.lib)
+  set(JAMID_LIB ${DAEMON_DIR}/build/x64/ReleaseLib_win32/bin/libjami.lib)
   set(GNUTLS_LIB ${DAEMON_DIR}/contrib/msvc/lib/x64/libgnutls.lib)
 
   # Beta config
diff --git a/extras/build/cmake/modules/FindLibJami.cmake b/extras/build/cmake/modules/FindLibJami.cmake
index 5cce45fc095afac700ed9ba0cba333dca6b880b1..4490d3ae31cb254c72ef7cb951785a1a38046879 100644
--- a/extras/build/cmake/modules/FindLibJami.cmake
+++ b/extras/build/cmake/modules/FindLibJami.cmake
@@ -53,6 +53,11 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES_orig ${CMAKE_FIND_LIBRARY_SUFFIXES})
 
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib;.so;.dll")
 
+# Add the lib prefix for Windows checks.
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+  set(CMAKE_FIND_LIBRARY_PREFIXES "lib;")
+endif()
+
 if(WITH_DAEMON_SUBMODULE)
   find_library(LIBJAMI_LIB NAMES jami ring
     PATHS ${DAEMON_DIR}/src/.libs
diff --git a/extras/scripts/build-windows.py b/extras/scripts/build-windows.py
index d37f745c98a11e7548051d608137042e13521739..341e6b9f4fee796084d3018cab7784381b804bf9 100644
--- a/extras/scripts/build-windows.py
+++ b/extras/scripts/build-windows.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """
 Build, test, and package the project.
 
@@ -340,9 +341,13 @@ def deploy_runtimes(qt_dir):
     print("Running windeployqt (this may take a while)...")
     win_deploy_qt = os.path.join(qt_dir, "bin", "windeployqt.exe")
     qml_src_dir = os.path.join(repo_root_dir, "src", "app")
-    os.environ["VCINSTALLDIR"] = os.path.join(
-        get_vs_prop("installationPath"), "VC")
-    executable = os.path.join(runtime_dir, "Jami.exe")
+    installation_dir = get_vs_prop("installationPath")
+    if not installation_dir:
+        print("Visual Studio not found. Please install Visual Studio 2017 or "
+              "later.")
+        sys.exit(1)
+    os.environ["VCINSTALLDIR"] = os.path.join(installation_dir, "VC")
+    executable = os.path.join(runtime_dir.encode(), b"Jami.exe")
     execute_cmd([win_deploy_qt, "--verbose", "1", "--no-compiler-runtime",
                  "--qmldir", qml_src_dir, "--release", executable],
                 False, cmd_dir=runtime_dir)
@@ -483,7 +488,11 @@ def main():
         print("These scripts will only run on a 64-bit system for now.")
         sys.exit(1)
     if sys.platform == "win32":
-        vs_version = get_vs_prop("installationVersion").split(".")[0]
+        vs_version = get_vs_prop("installationVersion")
+        if vs_version is None:
+            print("Visual Studio version not found.")
+            sys.exit(1)
+        vs_version = vs_version.split(".")[0]
         if vs_version is None or int(vs_version) < 15:
             print("Visual Studio 2017 or later is required.")
             sys.exit(1)