diff --git a/flow/scripts/floorplan.tcl b/flow/scripts/floorplan.tcl
index 00c1b8dabe..124bac05d6 100644
--- a/flow/scripts/floorplan.tcl
+++ b/flow/scripts/floorplan.tcl
@@ -130,7 +130,6 @@ if { !$::env(SKIP_REPAIR_TIE_FANOUT) } {
 }
 
 if { [env_var_exists_and_non_empty SWAP_ARITH_OPERATORS] } {
-  log_cmd estimate_parasitics -placement
   replace_arith_modules
 }
 
@@ -139,7 +138,7 @@ if { $::env(REMOVE_ABC_BUFFERS) } {
   remove_buffers
 } else {
   # Skip clone & split
-  repair_timing_helper -setup -skip_last_gasp -sequence "unbuffer,sizeup,swap,buffer,vt_swap"
+  repair_timing_helper -setup -skip_last_gasp -sequence "unbuffer,sizeup,swap,vt_swap"
 }
 
 puts "Default units for flow"
diff --git a/tools/OpenROAD b/tools/OpenROAD
index 1b3a3b6a76..168f0de634 160000
--- a/tools/OpenROAD
+++ b/tools/OpenROAD
@@ -1 +1 @@
-Subproject commit 1b3a3b6a761c1a50798ab59c29f0dfc940242eaf
+Subproject commit 168f0de6348d7852fa9775c1a7d24bf0e7faedb5