diff --git a/cicd_testing/do-gather-bins.sh b/cicd_testing/do-gather-bins.sh
index ea9a9e4f2eeb25531da7d264dc11b4dc23204cd0..a92cedfc02b7fa88bb9bbc4d8cf6b967e8b8f4dd 100755
--- a/cicd_testing/do-gather-bins.sh
+++ b/cicd_testing/do-gather-bins.sh
@@ -6,5 +6,5 @@ set -e
 mkdir -p artifacts/test_binaries/
 
 cp $(which ls) artifacts/test_binaries/ls.$(uname -m)
-cp $(which bzip2) artifacts/test_binaries/ls.$(uname -m)
+cp $(which bzip2) artifacts/test_binaries/bzip2.$(uname -m)
 ls
diff --git a/irdb-libs/ir_builders/fill_in_indtargs.cpp b/irdb-libs/ir_builders/fill_in_indtargs.cpp
index 4e085d55afd3a13f3fa1719c3282b7d1373b972d..b13d9c2228e26c98a62176226b15c1fd3d6a996f 100644
--- a/irdb-libs/ir_builders/fill_in_indtargs.cpp
+++ b/irdb-libs/ir_builders/fill_in_indtargs.cpp
@@ -3272,7 +3272,7 @@ void unpin_elf_tables(FileIR_t *firp, int64_t do_unpin_opt)
 				auto insn=lookupInstruction(firp,vo);
 
 				// OK for .got scoop to miss, some entries are empty.
-				if(scoop->getName()==".got" && insn==nullptr)
+				if(scoop->getName()==".got" && (vo==0 || insn==nullptr))
 				{
 					if(getenv("UNPIN_VERBOSE")!=0)
 						cout<<"Skipping "<<scoop->getName()<<" unpin for "<<hex<<vo<<" due to no instruction at vo"<<endl;
diff --git a/zipr b/zipr
index 90b4041d328482923a545730702619d30b72165a..649ee3103270dc4abf3dc890afec28e12aaa5900 160000
--- a/zipr
+++ b/zipr
@@ -1 +1 @@
-Subproject commit 90b4041d328482923a545730702619d30b72165a
+Subproject commit 649ee3103270dc4abf3dc890afec28e12aaa5900