diff --git a/lib/Graph/Nodes.cpp b/lib/Graph/Nodes.cpp
index ed0c6e4089..a7c7390d5b 100644
--- a/lib/Graph/Nodes.cpp
+++ b/lib/Graph/Nodes.cpp
@@ -384,7 +384,7 @@ bool AvgPoolGradNode::verify() const {
   isValid &= verifyPool(getGradOfInputNamedInput(),
                         getGradOfOriginalOutputNamedResult(), Kernels_,
                         Strides_, Pads_);
-  return true;
+  return isValid;
 }
 
 bool MatMulNode::verify() const {
diff --git a/lib/Optimizer/IROptimizer.cpp b/lib/Optimizer/IROptimizer.cpp
index 5cd7990cf7..753ad55cc6 100644
--- a/lib/Optimizer/IROptimizer.cpp
+++ b/lib/Optimizer/IROptimizer.cpp
@@ -574,7 +574,7 @@ static void calculateLiveIntervals(const IRFunction &M,
           (opKind == OperandKind::Out) &&
           (op->getType()->size() < loc->getType()->size());
 
-      auto opIdx = instIdx;
+      unsigned opIdx;
       if (opKind == OperandKind::Out && !isPartialWrite) {
         opIdx =
             LiveIntervalsInstructionNumbering::getInstrWriteSlotNumber(instIdx);