diff --git a/Makefile.in b/Makefile.in
index 68c5cee..db26c18 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -229,7 +229,8 @@ python-@PYTHON_VERSION@-tn3270-@PACKAGE_VERSION@.@host_cpu@.zip: \
 		-9 \
 		-j \
 		$@ \
-		$(BINRLS)/$(LIBNAME)@DLLEXT@
+		$(BINRLS)/$(LIBNAME)@DLLEXT@ \
+		testprograms/*.py
 
 #---[ Debug Targets ]--------------------------------------------------------------------
 
diff --git a/src/module/windows/tools.cc b/src/module/windows/tools.cc
index 3f290d9..9cbb124 100644
--- a/src/module/windows/tools.cc
+++ b/src/module/windows/tools.cc
@@ -51,6 +51,7 @@
 		"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\pw3270"
 	};
 
+	memset(datadir,0,sizeof(datadir));
 	for(size_t ix = 0; !*datadir && ix < (sizeof(keys)/sizeof(keys[0])); ix++) {
 
 		rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE,keys[ix],0,KEY_QUERY_VALUE,&hKey);
--
libgit2 0.21.2