diff --git a/libIRDB/test/check_thunks.cpp b/libIRDB/test/check_thunks.cpp
index 189f129b91dea10c02306fe3ff6ba38ab190128f..d6705b46286777261b5f901bcccbcc86ab273da3 100644
--- a/libIRDB/test/check_thunks.cpp
+++ b/libIRDB/test/check_thunks.cpp
@@ -257,7 +257,7 @@ bool is_pop(Instruction_t* insn, string &reg)
         if(d.getMnemonic()!="pop")
                 return false;
 
-	reg=d.getOperand(1).getString();
+	reg=d.getOperand(0).getString();
         return true;
 }
 
diff --git a/libIRDB/test/fill_in_cfg.cpp b/libIRDB/test/fill_in_cfg.cpp
index 5bc248849384e6ead8f20dd1eb4a5de88200e06f..443358ed05f7d149d6156825612d664b5cb0aea4 100644
--- a/libIRDB/test/fill_in_cfg.cpp
+++ b/libIRDB/test/fill_in_cfg.cpp
@@ -556,7 +556,8 @@ void fill_in_landing_pads(FileIR_t *firp)
 {
 	const auto eh_frame_rep_ptr = split_eh_frame_t::factory(firp);
 	eh_frame_rep_ptr->parse();
-	eh_frame_rep_ptr->print();
+	if(getenv("EHIR_VERBOSE"))
+		eh_frame_rep_ptr->print();
 	cout<<"Completed eh-frame parsing"<<endl;
 
 	map<Function_t*,set<Instruction_t*> > insns_to_add_to_funcs;