diff --git a/setup/package.py b/setup/package.py
index 56805d14683423618696002bc8a8871a0ab02970..3fcb96aed9299766658e882b855fd5752b70124d 100755
--- a/setup/package.py
+++ b/setup/package.py
@@ -216,7 +216,7 @@ class KVM(object):
 class KVMWinBuildExe(KVM):
     def run(self):
         with open(join(self.o.build_dir, 'setup/win32/Makefile.version'), 'w') as f:
-            f.write("VERSION=%s\n" % version.replace('~', '_'))
+            f.write("VERSION=%s\n" % version.replace('~', '_').replace('+', ''))
         with open(join(self.o.build_dir, 'setup/win32/Makefile.python'), 'w') as f:
             f.write("PYTHON_VERSION=%s\n" % self.o.vm_winxp_python_version.replace('.', ''))
         with open(join(self.o.build_dir, 'setup/win32/Makefile.servicename'), 'w') as f:
diff --git a/setup/win32/setup.nsi b/setup/win32/setup.nsi
index 004ea5f398e47384ec5a3b775989c59d3e12652d..10dbc9e52d842c2c1e4c77650bb9c5671b7d0092 100755
--- a/setup/win32/setup.nsi
+++ b/setup/win32/setup.nsi
@@ -312,6 +312,8 @@ Section "Uninstall"
 
     Rmdir /r "$INSTDIR\server"
     Rmdir /r "$INSTDIR\thirdparty"
+    Rmdir /r "$INSTDIR\python"
+    Rmdir /r "$INSTDIR\nssm"
     DeleteRegKey HKLM "${UNINSTALL_REGISTRY_KEY}"
 SectionEnd