diff --git a/library/data_offload/data_offload.v b/library/data_offload/data_offload.v
index 606947bf9..60b143d10 100644
--- a/library/data_offload/data_offload.v
+++ b/library/data_offload/data_offload.v
@@ -91,7 +91,6 @@ module data_offload #(
   input                                       s_axis_last,
   input  [SRC_DATA_WIDTH/8-1:0]               s_axis_tkeep,
 
-
   // AXI4 stream master for destination stream (RX_DMA or DAC) -- Destination
   // interface
 
@@ -119,11 +118,11 @@ module data_offload #(
   output                                      fifo_src_wlast,
 
   output                                      fifo_dst_ren,
+  input                                       fifo_dst_ready,
   output                                      fifo_dst_resetn,
   output  [DST_ADDR_WIDTH-1:0]                fifo_dst_raddr,
   input   [DST_DATA_WIDTH-1:0]                fifo_dst_rdata,
   output                                      fifo_dst_rlast,
-  input                                       fifo_dst_ready,
 
   // Status and monitor
 
@@ -406,7 +405,7 @@ always @(posedge s_axis_aclk) begin
   end
 end
 // transfer length is in bytes, but counter monitors the source data beats
-assign src_wr_last_beat_s = (src_transfer_length_s == 32'h0) ? MEM_SIZE[31:SRC_BEAT_BYTE] : src_transfer_length_s[31:SRC_BEAT_BYTE];
+assign src_wr_last_beat_s = (src_transfer_length_s == 32'h0) ? MEM_SIZE[31:SRC_BEAT_BYTE]-1 : src_transfer_length_s[31:SRC_BEAT_BYTE];
 assign src_wr_last_int_s = (src_data_counter == src_wr_last_beat_s) ?  1'b1 : 1'b0;
 
 endmodule
diff --git a/library/data_offload/data_offload_fsm.v b/library/data_offload/data_offload_fsm.v
index 1ff1d28d7..4f751fa0a 100644
--- a/library/data_offload/data_offload_fsm.v
+++ b/library/data_offload/data_offload_fsm.v
@@ -35,7 +35,7 @@
 `timescale 1ns/100ps
 
 /* This module controls the read and write access to the storage unit. It is
-* used for bot transmit and receive use cases
+* used for both transmit and receive use cases
 */
 
 module data_offload_fsm #(
@@ -209,7 +209,7 @@ module data_offload_fsm #(
   assign wr_init_req_pos_s = ~wr_init_req_d & wr_init_req_s;
 
   // status bits
-  assign wr_full = (wr_addr == {WR_ADDRESS_WIDTH{1'b1}}) ? 1'b1 : 1'b0;
+  assign wr_full = (wr_addr == {{(WR_ADDRESS_WIDTH-1){1'b1}}, 1'b0}) ? 1'b1 : 1'b0;
 
   // generate INIT acknowledge signal in WRITE domain (in case of ADCs)
   assign wr_init_ack_s = (wr_fsm_state == WR_SYNC) ? 1'b1 : 1'b0;