diff --git a/rowhammer_tester/gateware/payload_executor.py b/rowhammer_tester/gateware/payload_executor.py
index d88b00bd..44ac6f0c 100644
--- a/rowhammer_tester/gateware/payload_executor.py
+++ b/rowhammer_tester/gateware/payload_executor.py
@@ -123,7 +123,7 @@ def __init__(self, instruction, *, rankbits, bankbits, rowbits, colbits):
 
         if rankbits:
             self.dfi_rank = Signal(rankbits)
-            self.comb += self.dfi_bank.eq(self.address[:rankbits]),
+            self.comb += self.dfi_rank.eq(self.address[:rankbits]),
 
 class Encoder:
     """Helper for writing payloads"""
diff --git a/rowhammer_tester/scripts/hw_rowhammer.py b/rowhammer_tester/scripts/hw_rowhammer.py
index 9534bcc6..972407dc 100755
--- a/rowhammer_tester/scripts/hw_rowhammer.py
+++ b/rowhammer_tester/scripts/hw_rowhammer.py
@@ -120,7 +120,7 @@ def run(self, row_pairs, pattern_generator, read_count, row_progress=16, verify_
             for i, row_tuple in enumerate(row_pairs, start=1):
                 s = 'Iter {:{n}} / {:{n}}'.format(i, len(row_pairs), n=len(str(len(row_pairs))))
                 if self.payload_executor:
-                    self.payload_executor_attack(read_count=read_count, row_tuple=row_tuple)
+                    self.payload_executor_attack(read_count=read_count//len(row_tuple), row_tuple=row_tuple)
                 else:
                     if len(row_tuple) & (len(row_tuple) - 1) != 0:
                         print("ERROR: BIST only supports power of 2 rows\n")
diff --git a/rowhammer_tester/scripts/rowhammer.py b/rowhammer_tester/scripts/rowhammer.py
index 23d284c1..ffd638b2 100755
--- a/rowhammer_tester/scripts/rowhammer.py
+++ b/rowhammer_tester/scripts/rowhammer.py
@@ -293,8 +293,8 @@ def payload_executor_attack(self, read_count, row_tuple):
             read_count=read_count,
             row_sequence=row_tuple,
             timings=self.settings.timing,
-            bankbits=self.settings.geom.bankbits,
-            bank=self.bank,
+            bankbits=self.settings.geom.bankbits if self.settings.phy.memtype != "DDR5" else self.settings.geom.bankbits + 1,
+            bank=self.bank if self.settings.phy.memtype != "DDR5" else self.bank*2,
             payload_mem_size=self.wb.mems.payload.size,
             refresh=not self.no_refresh,
             sys_clk_freq=sys_clk_freq,
diff --git a/third_party/litedram b/third_party/litedram
index 2c0d3472..c78de945 160000
--- a/third_party/litedram
+++ b/third_party/litedram
@@ -1 +1 @@
-Subproject commit 2c0d34729738286e1ea28e0832887e2e5d346450
+Subproject commit c78de945880b74c1e3d852760dcc6ad2b1868a55