diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 54d6f0f..f922cfe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 jobs:
   build-windows:
-    runs-on: windows-2019
+    runs-on: windows-2022
     defaults:
       run:
         shell: cmd
@@ -22,7 +22,7 @@ jobs:
         with:
           name: blisp Windows x64 build
           path: |
-            build/tools/blisp/blisp.exe
+            build/tools/blisp/Release/blisp.exe
           if-no-files-found: error
 
   build-macos:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9963e65..3549185 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,8 @@ target_sources(libblisp_obj PRIVATE
 target_include_directories(libblisp_obj PRIVATE ${CMAKE_SOURCE_DIR}/vendor/libserialport)
 
 if(WIN32)
-    target_link_libraries(libblisp_obj PRIVATE Setupapi.lib)
+    target_link_libraries(libblisp PRIVATE Setupapi.lib)
+    target_link_libraries(libblisp_static PRIVATE Setupapi.lib)
     target_compile_definitions(libblisp_obj PRIVATE LIBSERIALPORT_MSBUILD)
     target_sources(libblisp_obj PRIVATE
             ${CMAKE_SOURCE_DIR}/vendor/libserialport/windows.c)
diff --git a/lib/blisp_easy.c b/lib/blisp_easy.c
index d0df3a8..086d189 100644
--- a/lib/blisp_easy.c
+++ b/lib/blisp_easy.c
@@ -66,7 +66,11 @@ int32_t blisp_easy_load_segment_data(
 
   uint32_t sent_data = 0;
   uint32_t buffer_size = 0;
+#ifdef _WIN32
+  uint8_t buffer[4092];
+#else
   uint8_t buffer[buffer_max_size];
+#endif
 
   blisp_easy_report_progress(progress_callback, 0, segment_size);
 
@@ -333,7 +337,11 @@ int32_t blisp_easy_flash_write(struct blisp_device* device,
 
   uint32_t sent_data = 0;
   uint32_t buffer_size = 0;
+#ifdef _WIN32
+  uint8_t buffer[2052];
+#else
   uint8_t buffer[buffer_max_size];
+#endif
   blisp_easy_report_progress(progress_callback, 0, data_size);
 
   while (sent_data < data_size) {