diff --git a/hpvm/include/SupportHPVM/DFG2LLVM.h b/hpvm/include/SupportHPVM/DFG2LLVM.h
index fb1e35033eda0445f10423beb69aab5f07c093f0..c1ade92e9a7201a5c3c80e9302b9bac57c750537 100644
--- a/hpvm/include/SupportHPVM/DFG2LLVM.h
+++ b/hpvm/include/SupportHPVM/DFG2LLVM.h
@@ -291,6 +291,7 @@ Function *CodeGenTraversal::addArgument(Function *F, Type *Ty,
 // Return new function with additional index and limit arguments.
 // The original function is removed from the module and erased.
 Function *CodeGenTraversal::addIdxDimArgs(Function *F) {
+  DEBUG(errs() << "Adding dimension and limit arguments to Function: " << F->getName());
   DEBUG(errs() << "Function Type: " << *F->getFunctionType() << "\n");
   // Add Index and Dim arguments
   std::string names[] = {"idx_x", "idx_y", "idx_z", "dim_x", "dim_y", "dim_z"};
diff --git a/hpvm/include/SupportHPVM/HPVMUtils.h b/hpvm/include/SupportHPVM/HPVMUtils.h
index ee18a81273b7e5ce2f5751fbd973ad01f09f55f6..2a5116ddb122b16b28ee45022d7c57409cdce566 100644
--- a/hpvm/include/SupportHPVM/HPVMUtils.h
+++ b/hpvm/include/SupportHPVM/HPVMUtils.h
@@ -175,14 +175,15 @@ void replaceNodeFunctionInIR(Module &M, Function *F, Function *G) {
           continue;
 
         // Otherwise, replace F with G
-        DEBUG(errs() << *G->getType() << "\n");
-        DEBUG(errs() << *CI->getArgOperand(1)->getType() << "\n");
+        DEBUG(errs() << "Fixing use: " << *CI << "\n");
+        DEBUG(errs() << "in function: " << Func.getName() << "\n");
         CI->setArgOperand(1, G);
+        DEBUG(errs() << "Fixed use: " << *CI << "\n");
       }
     }
 
     for (auto I : toBeErased) {
-      DEBUG(errs() << "\tErasing " << *I << "\n");
+      DEBUG(errs() << "\tErasing Instruction: " << *I << "\n");
       I->eraseFromParent();
     }
   }