diff --git a/passes/opt/opt_balance_tree.cc b/passes/opt/opt_balance_tree.cc
index 0d5a61f5d..4791bae16 100644
--- a/passes/opt/opt_balance_tree.cc
+++ b/passes/opt/opt_balance_tree.cc
@@ -329,8 +329,10 @@ struct OptBalanceTreePass : public Pass {
 		extra_args(args, argidx, design);
 
 		// Run splitfanout pass first
-		if (splitfanout)
-			Pass::call(design, "splitfanout -limit 512 t:$and t:$or t:$xor t:$xnor t:$add t:$mul");
+		if (splitfanout) {
+			// Pass::call(design, "splitfanout -limit 512 t:$and t:$or t:$xor t:$xnor t:$add t:$mul");
+			Pass::call(design, "splitfanout -limit 512 t:$add t:$mul");
+		}
 
 		// Count of all cells that were packed
 		dict<IdString, int> cell_count;
diff --git a/passes/techmap/Makefile.inc b/passes/techmap/Makefile.inc
index 18cd67a08..0d796c1b2 100644
--- a/passes/techmap/Makefile.inc
+++ b/passes/techmap/Makefile.inc
@@ -10,6 +10,9 @@ OBJS += passes/techmap/libparse.o
 OBJS += passes/techmap/bmuxmap.o
 OBJS += passes/techmap/demuxmap.o
 OBJS += passes/techmap/pmuxtree.o
+OBJS += passes/techmap/alumacc.o
+OBJS += passes/techmap/extract.o
+OBJS += passes/techmap/extract_reduce.o
 
 ifeq ($(ENABLE_ABC),1)
 OBJS += passes/techmap/abc.o
@@ -29,11 +32,8 @@ ifneq ($(SMALL),1)
 OBJS += passes/techmap/iopadmap.o
 OBJS += passes/techmap/clkbufmap.o
 OBJS += passes/techmap/hilomap.o
-OBJS += passes/techmap/extract.o
 OBJS += passes/techmap/extract_fa.o
 OBJS += passes/techmap/extract_counter.o
-OBJS += passes/techmap/extract_reduce.o
-OBJS += passes/techmap/alumacc.o
 OBJS += passes/techmap/dffinit.o
 OBJS += passes/techmap/bwmuxmap.o
 OBJS += passes/techmap/muxcover.o