diff --git a/hw/opae/gen_sources.sh b/hw/opae/gen_sources.sh
index 9f4aec31..12af3164 100755
--- a/hw/opae/gen_sources.sh
+++ b/hw/opae/gen_sources.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 rtl_dir="../rtl"
-exclude_list="VX_fpnew.v"
+exclude_list="VX_fpu_fpnew.v"
 file_list=""
 
 add_dirs()
diff --git a/hw/rtl/afu/vortex_afu.sv b/hw/rtl/afu/vortex_afu.sv
index efec4550..b6ba25c6 100644
--- a/hw/rtl/afu/vortex_afu.sv
+++ b/hw/rtl/afu/vortex_afu.sv
@@ -185,24 +185,34 @@ wire [2:0] cmd_type = (cp2af_sRxPort.c0.mmioWrValid && (MMIO_CMD_TYPE == mmio_hd
 reg scope_start;
 `endif
 
-// disable assertions until reset
+// disable assertions until full reset
 `ifndef VERILATOR
+reg [$clog2(RESET_DELAY+1)-1:0] reset_ctr;
 initial begin
   $assertoff;  
 end
+always @(posedge clk) begin
+  if (reset) begin
+    reset_ctr <= 0;
+  end else begin
+    reset_ctr <= reset_ctr + 1;
+    if (reset_ctr == RESET_DELAY) begin
+      $asserton; // enable assertions
+    end
+  end
+end
 `endif
 
 always @(posedge clk) begin
   if (reset) begin
-  `ifndef VERILATOR
-    $asserton; // enable assertions
-  `endif
     mmio_tx.mmioRdValid <= 0;
     mmio_tx.hdr         <= 0;
   `ifdef SCOPE
     scope_start         <= 0;
   `endif
   end else begin
+
+
     mmio_tx.mmioRdValid <= cp2af_sRxPort.c0.mmioRdValid; 
     mmio_tx.hdr.tid     <= mmio_hdr.tid;
   `ifdef SCOPE