diff --git a/libclambcc/ClamBCAnalyzer/ClamBCAnalyzer.cpp b/libclambcc/ClamBCAnalyzer/ClamBCAnalyzer.cpp
index 494b7413af..f7f524edf5 100644
--- a/libclambcc/ClamBCAnalyzer/ClamBCAnalyzer.cpp
+++ b/libclambcc/ClamBCAnalyzer/ClamBCAnalyzer.cpp
@@ -297,7 +297,7 @@ void ClamBCAnalysis::run(Module & m)
             }
             continue;
         }
-        DEBUGERR << "THIS IS THE PLACE TO LOOK" << "<END>\n";
+        //DEBUGERR << "THIS IS THE PLACE TO LOOK" << "<END>\n";
         //DEBUG_NONPOINTER(F.getName());
         //DEBUG_VALUE(&F);
         functionIDs[&F] = fid++;
diff --git a/libclambcc/ClamBCRebuild/ClamBCRebuild.cpp b/libclambcc/ClamBCRebuild/ClamBCRebuild.cpp
index 1365399899..019d25fbf9 100644
--- a/libclambcc/ClamBCRebuild/ClamBCRebuild.cpp
+++ b/libclambcc/ClamBCRebuild/ClamBCRebuild.cpp
@@ -218,6 +218,10 @@ class ClamBCRebuild : public PassInfoMixin<ClamBCRebuild>, public InstVisitor<Cl
         std::vector<Function *> funcs;
         for (auto i = pMod->begin(), e = pMod->end(); i != e; i++) {
             Function *pFunc = llvm::cast<Function>(i);
+            const FunctionType *FTy = pFunc->getFunctionType();
+            if (FTy->isVarArg()){
+                return PreservedAnalyses::all();
+            }
             funcs.push_back(pFunc);
         }
         for (size_t i = 0; i < funcs.size(); i++) {
diff --git a/libclambcc/ClamBCRemoveUndefs/ClamBCRemoveUndefs.cpp b/libclambcc/ClamBCRemoveUndefs/ClamBCRemoveUndefs.cpp
index 929173de94..9718970809 100644
--- a/libclambcc/ClamBCRemoveUndefs/ClamBCRemoveUndefs.cpp
+++ b/libclambcc/ClamBCRemoveUndefs/ClamBCRemoveUndefs.cpp
@@ -238,6 +238,8 @@ struct ClamBCRemoveUndefs : public PassInfoMixin<ClamBCRemoveUndefs >
     PreservedAnalyses run(Module & m, ModuleAnalysisManager & MAM)
 #endif
     {
+        DEBUGERR << "This was causing issues in testing, so removed.  Still need to verify that we no longer need it" << "<END>\n"; return PreservedAnalyses::all();
+
         pMod = &m;
 
         for (auto i = pMod->begin(), e = pMod->end(); i != e; i++) {