diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index 2b45d8e77..08d63554f 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -31,7 +31,7 @@ export PATH=$PATH:$RISCV/bin
 
 set -e # break on error
 
-NUM_THREADS=1 # for low memory machines > 16GiB
+NUM_THREADS=32 # for low memory machines > 16GiB
 #NUM_THREADS=8  # for >= 32GiB
 #NUM_THREADS=16  # for >= 64GiB
 
diff --git a/fpga/constraints/debug2.xdc b/fpga/constraints/debug2.xdc
index 8b0b7c448..ecb3b8e73 100644
--- a/fpga/constraints/debug2.xdc
+++ b/fpga/constraints/debug2.xdc
@@ -281,7 +281,7 @@ connect_debug_port u_ila_0/probe53 [get_nets [list wallypipelinedsoc/core/hzu/Re
 create_debug_port u_ila_0 probe
 set_property port_width 1 [get_debug_ports u_ila_0/probe54]
 set_property PROBE_TYPE DATA_AND_TRIGGER [get_debug_ports u_ila_0/probe54]
-connect_debug_port u_ila_0/probe54 [get_nets [list wallypipelinedsoc/core/hzu/TrapM ]]
+connect_debug_port u_ila_0/probe54 [get_nets [list wallypipelinedsoc/core/hzu/StallFCause ]]
 
 create_debug_port u_ila_0 probe
 set_property port_width 1 [get_debug_ports u_ila_0/probe55]
diff --git a/fpga/constraints/marked_debug.txt b/fpga/constraints/marked_debug.txt
index ff0fb325c..9e51d15ad 100644
--- a/fpga/constraints/marked_debug.txt
+++ b/fpga/constraints/marked_debug.txt
@@ -14,7 +14,6 @@ ieu/regfile.sv: logic    rf
 ieu/datapath.sv: logic                 RegWriteW
 hazard/hazard.sv: logic	         BPPredWrongE
 hazard/hazard.sv: logic	         LoadStallD
-hazard/hazard.sv: logic	         LSUStallM
 hazard/hazard.sv: logic          FCvtIntStallD
 hazard/hazard.sv: logic	         DivBusyE
 hazard/hazard.sv: logic	         EcallFaultM