diff --git a/config/rv32gc/coverage.svh b/config/rv32gc/coverage.svh
index d4898ff64..20bddd5c0 100644
--- a/config/rv32gc/coverage.svh
+++ b/config/rv32gc/coverage.svh
@@ -13,44 +13,48 @@
 `define CLINT_BASE 64'h02000000
 
 // Unprivileged extensions
-// `include "I_coverage.svh"
-// `include "M_coverage.svh"
-// `include "F_coverage.svh"
-// `include "D_coverage.svh"
-// `include "Zba_coverage.svh"
-// `include "Zbb_coverage.svh"
-// `include "Zbc_coverage.svh"
-// `include "Zbs_coverage.svh"
-// `include "ZfaF_coverage.svh"
-// `include "ZfaD_coverage.svh"
-// `include "ZfaZfh_coverage.svh"
-// `include "Zfh_coverage.svh"
-// `include "ZfhD_coverage.svh"
-// `include "Zicond_coverage.svh"
-// `include "Zca_coverage.svh"
-// `include "Zcb_coverage.svh"
-// `include "ZcbM_coverage.svh"
-// `include "ZcbZbb_coverage.svh"
-// `include "Zcf_coverage.svh"
-// `include "Zcd_coverage.svh"
-// `include "Zicsr_coverage.svh"
-// `include "Zbkb_coverage.svh"
-// `include "Zbkc_coverage.svh"
-// `include "Zbkx_coverage.svh"
-// `include "Zknd_coverage.svh"
-// `include "Zkne_coverage.svh"
-// `include "Zknh_coverage.svh"
-// `include "Zaamo_coverage.svh"
-// `include "Zalrsc_coverage.svh"
+`include "I_coverage.svh"
+`include "M_coverage.svh"
+`include "F_coverage.svh"
+`include "D_coverage.svh"
+`include "Zba_coverage.svh"
+`include "Zbb_coverage.svh"
+`include "Zbc_coverage.svh"
+`include "Zbs_coverage.svh"
+`include "ZfaF_coverage.svh"
+`include "ZfaD_coverage.svh"
+`include "ZfaZfh_coverage.svh"
+`include "Zfh_coverage.svh"
+`include "ZfhD_coverage.svh"
+// Note: Zfhmin is a subset of Zfh, so usually only one or the other would be used.  When Zfhmin and D are supported, ZfhD should also be enabled
+`include "Zfhmin_coverage.svh"
+// Note: Zmmul is a subset of M, so usually only one or the other would be used.
+`include "Zmmul_coverage.svh"
+`include "Zicond_coverage.svh"
+`include "Zca_coverage.svh"
+`include "Zcb_coverage.svh"
+`include "ZcbM_coverage.svh"
+`include "ZcbZbb_coverage.svh"
+`include "Zcf_coverage.svh"
+`include "Zcd_coverage.svh"
+`include "Zicsr_coverage.svh"
+`include "Zbkb_coverage.svh"
+`include "Zbkc_coverage.svh"
+`include "Zbkx_coverage.svh"
+`include "Zknd_coverage.svh"
+`include "Zkne_coverage.svh"
+`include "Zknh_coverage.svh"
+`include "Zaamo_coverage.svh"
+`include "Zalrsc_coverage.svh"
 
 // Privileged extensions
-// `include "ZicsrM_coverage.svh"
-// `include "ZicsrF_coverage.svh"
-// `include "ZicsrU_coverage.svh"
+`include "ZicsrM_coverage.svh"
+`include "ZicsrF_coverage.svh"
+`include "ZicsrU_coverage.svh"
 `include "RV32VM_coverage.svh"
 `include "RV32VM_PMP_coverage.svh"
-// `include "EndianU_coverage.svh"
-// `include "EndianM_coverage.svh"
-// `include "EndianS_coverage.svh"
-// `include "ExceptionsM_coverage.svh"
-// `include "ExceptionsZc_coverage.svh"
+`include "EndianU_coverage.svh"
+`include "EndianM_coverage.svh"
+`include "EndianS_coverage.svh"
+`include "ExceptionsM_coverage.svh"
+`include "ExceptionsZc_coverage.svh"
diff --git a/config/rv64gc/coverage.svh b/config/rv64gc/coverage.svh
index 9c0045ae3..fd8f11b04 100644
--- a/config/rv64gc/coverage.svh
+++ b/config/rv64gc/coverage.svh
@@ -13,46 +13,50 @@
 `define CLINT_BASE 64'h02000000
 
 // Unprivileged extensions
-// `include "I_coverage.svh"
-// `include "M_coverage.svh"
-// `include "F_coverage.svh"
-// `include "D_coverage.svh"
-// `include "Zba_coverage.svh"
-// `include "Zbb_coverage.svh"
-// `include "Zbc_coverage.svh"
-// `include "Zbs_coverage.svh"
-// `include "ZfaF_coverage.svh"
-// `include "ZfaD_coverage.svh"
-// `include "ZfaZfh_coverage.svh"
-// `include "ZfhD_coverage.svh"
-// `include "Zfh_coverage.svh"
-// `include "Zicond_coverage.svh"
-// `include "Zca_coverage.svh"
-// `include "Zcb_coverage.svh"
-// `include "ZcbM_coverage.svh"
-// `include "ZcbZbb_coverage.svh"
-// `include "ZcbZba_coverage.svh"
-// `include "Zcd_coverage.svh"
-// `include "Zicsr_coverage.svh"
-// `include "Zbkb_coverage.svh"
-// `include "Zbkc_coverage.svh"
-// `include "Zbkx_coverage.svh"
-// `include "Zknd_coverage.svh"
-// `include "Zkne_coverage.svh"
-// `include "Zknh_coverage.svh"
-// `include "Zaamo_coverage.svh"
-// `include "Zalrsc_coverage.svh"
+`include "I_coverage.svh"
+`include "M_coverage.svh"
+`include "F_coverage.svh"
+`include "D_coverage.svh"
+`include "Zba_coverage.svh"
+`include "Zbb_coverage.svh"
+`include "Zbc_coverage.svh"
+`include "Zbs_coverage.svh"
+`include "ZfaF_coverage.svh"
+`include "ZfaD_coverage.svh"
+`include "ZfaZfh_coverage.svh"
+`include "ZfhD_coverage.svh"
+`include "Zfh_coverage.svh"
+// Note: Zfhmin is a subset of Zfh, so usually only one or the other would be used.  When Zfhmin and D are supported, ZfhD should also be enabled
+`include "Zfhmin_coverage.svh"
+// Note: Zmmul is a subset of M, so usually only one or the other would be used.
+`include "Zmmul_coverage.svh"
+`include "Zicond_coverage.svh"
+`include "Zca_coverage.svh"
+`include "Zcb_coverage.svh"
+`include "ZcbM_coverage.svh"
+`include "ZcbZbb_coverage.svh"
+`include "ZcbZba_coverage.svh"
+`include "Zcd_coverage.svh"
+`include "Zicsr_coverage.svh"
+`include "Zbkb_coverage.svh"
+`include "Zbkc_coverage.svh"
+`include "Zbkx_coverage.svh"
+`include "Zknd_coverage.svh"
+`include "Zkne_coverage.svh"
+`include "Zknh_coverage.svh"
+`include "Zaamo_coverage.svh"
+`include "Zalrsc_coverage.svh"
 
 // Privileged extensions
 `include "RV64VM_coverage.svh"
-// `include "ZicsrM_coverage.svh"
-// `include "ZicsrF_coverage.svh"
-// `include "ZicsrU_coverage.svh"
-// `include "EndianU_coverage.svh"
-// `include "EndianM_coverage.svh"
-// `include "EndianS_coverage.svh"
-// `include "ExceptionsM_coverage.svh"
-// `include "ExceptionsZc_coverage.svh"
-`include "RV64VM_PMP_coverage.svh"
+`include "ZicsrM_coverage.svh"
+`include "ZicsrF_coverage.svh"
+`include "ZicsrU_coverage.svh"
+`include "EndianU_coverage.svh"
+`include "EndianM_coverage.svh"
+`include "EndianS_coverage.svh"
+`include "ExceptionsM_coverage.svh"
+`include "ExceptionsZc_coverage.svh"
+// `include "RV64VM_PMP_coverage.svh"
 // `include "RV64CBO_VM_coverage.svh"
 // `include "RV64CBO_PMP_coverage.svh"
diff --git a/sim/questa/wave.do b/sim/questa/wave.do
index 115a40773..ee42a7065 100644
--- a/sim/questa/wave.do
+++ b/sim/questa/wave.do
@@ -1,27 +1,6 @@
 onerror {resume}
 quietly virtual signal -install /testbench/dut/core/ifu/bpred/bpred { /testbench/dut/core/ifu/bpred/bpred/PostSpillInstrRawF[11:7]} rd
 quietly WaveActivateNextPane {} 0
-add wave -position insertpoint sim:/testbench/wallyTracer/PCF
-add wave -position insertpoint sim:/testbench/wallyTracer/PCD
-add wave -position insertpoint sim:/testbench/wallyTracer/PCE
-add wave -position insertpoint sim:/testbench/wallyTracer/PCM
-add wave -position insertpoint sim:/testbench/wallyTracer/PCW
-add wave -position insertpoint sim:/testbench/wallyTracer/GatedStallW
-add wave -position insertpoint sim:/testbench/dut/core/lsu/hptw/hptw/SelHPTW
-add wave -position insertpoint sim:/testbench/wallyTracer/StallM
-add wave -position insertpoint sim:/testbench/wallyTracer/StallW
-add wave -position insertpoint sim:/testbench/wallyTracer/FlushW
-add wave -position insertpoint sim:/testbench/wallyTracer/PTE_iF
-add wave -position insertpoint sim:/testbench/wallyTracer/PTE_iD
-add wave -position insertpoint sim:/testbench/wallyTracer/PTE_iE
-add wave -position insertpoint sim:/testbench/wallyTracer/PTE_iM
-add wave -position insertpoint sim:/testbench/wallyTracer/PTE_iW
-add wave -position insertpoint sim:/testbench/wallyTracer/PageType_iM
-add wave -position insertpoint sim:/testbench/wallyTracer/PageType_iW
-add wave -position insertpoint sim:/testbench/wallyTracer/ExecuteAccessM
-add wave -position insertpoint sim:/testbench/wallyTracer/ExecuteAccessW
-add wave -position insertpoint sim:/testbench/rvvi/valid
-add wave -position insertpoint sim:/testbench/rvvi/csr[0][0][834]
 add wave -noupdate /testbench/clk
 add wave -noupdate /testbench/reset
 add wave -noupdate /testbench/memfilename