diff --git a/power/VcdReader.cc b/power/VcdReader.cc
index 420e1449..30b0078e 100644
--- a/power/VcdReader.cc
+++ b/power/VcdReader.cc
@@ -478,7 +478,7 @@ ReadVcdActivities::checkClkPeriod(const Pin *pin,
         double clk_period = clk->period();
         if (abs((clk_period - sim_period) / clk_period) > sim_clk_period_tolerance_)
           // Warn if sim clock period differs from SDC by more than 10%.
-          report_->warn(1453, "clock %s vcd period %s differs from SDC clock period %s",
+          report_->warn(1452, "clock %s vcd period %s differs from SDC clock period %s",
                         clk->name(),
                         delayAsString(sim_period, this),
                         delayAsString(clk_period, this));
diff --git a/search/Bfs.cc b/search/Bfs.cc
index 5ea3d470..3ae832f5 100644
--- a/search/Bfs.cc
+++ b/search/Bfs.cc
@@ -196,7 +196,7 @@ BfsIterator::visitParallel(Level to_level,
             for (size_t k = 0; k < thread_count; k++) {
               // Last thread gets the left overs.
               size_t to = (k == thread_count - 1) ? vertex_count : from + chunk_size;
-              dispatch_queue_->dispatch( [=](int) {
+              dispatch_queue_->dispatch( [=, this](int) {
                 for (size_t i = from; i < to; i++) {
                   Vertex *vertex = level_vertices[i];
                   if (vertex) {
diff --git a/spice/WriteSpice.cc b/spice/WriteSpice.cc
index 9ef7b05d..c6da6e22 100644
--- a/spice/WriteSpice.cc
+++ b/spice/WriteSpice.cc
@@ -872,9 +872,8 @@ WriteSpice::gatePortValues(const Instance *,
   CUDD_VALUE_TYPE value;
   DdGen *cube_gen = Cudd_FirstCube(cudd_mgr, diff, &cube, &value);
 
-  FuncExprPortIterator port_iter(expr);
-  while (port_iter.hasNext()) {
-    const LibertyPort *port = port_iter.next();
+  LibertyPortSet ports = expr->ports();
+  for (const LibertyPort *port : ports) {
     if (port != input_port) {
       DdNode *port_node = bdd_.findNode(port);
       int var_index = Cudd_NodeReadIndex(port_node);