diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 00aef7e1b..1d4f2bc8d 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -191,6 +191,10 @@ jobs:
             triplet: x64-windows-static
             toolchain: ./cmake/llvm-win32-x86_64.cmake
             vcvars: x64
+#          - name: ARM
+#            triplet: arm-windows-static
+#            toolchain: ./cmake/llvm-win32-arm.cmake
+#            vcvars: x64_arm
           - name: ARM64
             triplet: arm64-windows-static
             toolchain: ./cmake/llvm-win32-aarch64.cmake
@@ -217,7 +221,7 @@ jobs:
 
       - name: Setup NuGet Credentials
         run: >
-          & (C:/vcpkg/vcpkg fetch nuget | tail -n 2)
+          & (C:/vcpkg/vcpkg --vcpkg-root "${{ env.VCPKG_ROOT }}" fetch nuget | tail -n 2)
           sources add
           -source "https://nuget.pkg.github.com/86Box/index.json"
           -storepasswordincleartext
diff --git a/README.md b/README.md
index a1e1b4432..20671420e 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 =====
 
 [![Build Status](https://ci.86box.net/job/86Box/badge/icon)](https://ci.86box.net/job/86Box/)
+[![License](https://img.shields.io/github/license/86Box/86Box)](COPYING) [![Latest release](https://img.shields.io/github/release/86Box/86Box.svg)](https://github.com/86Box/86Box/releases) [![Downloads](https://img.shields.io/github/downloads/86Box/86Box/total.svg)](https://github.com/86Box/86Box/releases)
 
 **86Box** is a low level x86 emulator that runs older operating systems and software designed for IBM PC systems and compatibles from 1981 through fairly recent system designs based on the PCI bus.
 
diff --git a/src/include/86box/plat.h b/src/include/86box/plat.h
index 34cf87365..1552b032f 100644
--- a/src/include/86box/plat.h
+++ b/src/include/86box/plat.h
@@ -55,15 +55,6 @@ extern int strnicmp(const char *s1, const char *s2, size_t n);
 #    define off64_t  off_t
 #endif
 
-#if __has_attribute(fallthrough)
-# define fallthrough __attribute__((fallthrough))
-#else
-# if __has_attribute(__fallthrough__)
-#  define fallthrough __attribute__((__fallthrough__))
-# endif
-# define fallthrough do {} while (0) /* fallthrough */
-#endif
-
 #ifdef _MSC_VER
 #    define UNUSED(arg) arg
 #else
@@ -89,6 +80,19 @@ extern "C" {
 #    define ssize_t intptr_t
 #endif
 
+#ifdef _MSC_VER
+# define fallthrough do {} while (0) /* fallthrough */
+#else
+# if __has_attribute(fallthrough)
+#  define fallthrough __attribute__((fallthrough))
+# else
+#  if __has_attribute(__fallthrough__)
+#   define fallthrough __attribute__((__fallthrough__))
+#  endif
+#  define fallthrough do {} while (0) /* fallthrough */
+# endif
+#endif
+
 /* Global variables residing in the platform module. */
 extern int          dopause;       /* system is paused */
 extern int          mouse_capture; /* mouse is captured in app */
diff --git a/src/include/86box/plat_fallthrough.h b/src/include/86box/plat_fallthrough.h
index 8d3f4581b..aadd4e14d 100644
--- a/src/include/86box/plat_fallthrough.h
+++ b/src/include/86box/plat_fallthrough.h
@@ -18,13 +18,17 @@
 #ifndef EMU_PLAT_FALLTHROUGH_H
 #define EMU_PLAT_FALLTHROUGH_H
 
-#if __has_attribute(__fallthrough__)
-# define fallthrough __attribute__((__fallthrough__))
+#ifdef _MSC_VER
+# define fallthrough do {} while (0) /* fallthrough */
 #else
 # if __has_attribute(fallthrough)
 #  define fallthrough __attribute__((fallthrough))
+# else
+#  if __has_attribute(__fallthrough__)
+#   define fallthrough __attribute__((__fallthrough__))
+#  endif
+#  define fallthrough do {} while (0) /* fallthrough */
 # endif
-# define fallthrough do {} while (0) /* fallthrough */
 #endif
 
 #endif /*EMU_PLAT_FALLTHROUGH_H*/
diff --git a/vcpkg.json b/vcpkg.json
index f9cf6783c..af8c75545 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -9,7 +9,8 @@
         "libpng",
         "sdl2",
         "rtmidi",
-        "libslirp"
+        "libslirp",
+        "fluidsynth"
     ],
     "features": {
         "qt-ui": {