diff --git a/cli/main_cli.cpp b/cli/main_cli.cpp
index 1be7b42..19d933f 100644
--- a/cli/main_cli.cpp
+++ b/cli/main_cli.cpp
@@ -63,6 +63,9 @@ static bool setup_handlers()
 {
     struct sigaction hup, term;
 
+    memset(&hup, 0, sizeof(hup));
+    memset(&term, 0, sizeof(term));
+
     hup.sa_handler = HeadlessManager::hupSignalHandler;
     sigemptyset(&hup.sa_mask);
     hup.sa_flags = 0;
diff --git a/windows/qcma.nsi b/windows/qcma.nsi
index 7a376b6..6f17001 100644
--- a/windows/qcma.nsi
+++ b/windows/qcma.nsi
@@ -126,7 +126,7 @@ section "install"
         File "win_x86_64\libstdc++-6.dll"
         File "win_x86_64\libtiff-5.dll"
         File "win_x86_64\libusb-1.0.dll"
-        File "win_x86_64\libvitamtp-4.dll"
+        File "win_x86_64\libvitamtp-5.dll"
         File "win_x86_64\libwinpthread-1.dll"
         File "win_x86_64\libxml2-2.dll"
         File "win_x86_64\Qt5Core.dll"
@@ -168,7 +168,7 @@ section "install"
         File "win_i686\libstdc++-6.dll"
         File "win_i686\libtiff-5.dll"
         File "win_i686\libusb-1.0.dll"
-        File "win_i686\libvitamtp-4.dll"
+        File "win_i686\libvitamtp-5.dll"
         File "win_i686\libwinpthread-1.dll"
         File "win_i686\libxml2-2.dll"
         File "win_i686\Qt5Core.dll"