diff --git a/internal-packages/replication/src/client.ts b/internal-packages/replication/src/client.ts
index 1a7ddb27236..2d906d81476 100644
--- a/internal-packages/replication/src/client.ts
+++ b/internal-packages/replication/src/client.ts
@@ -363,7 +363,7 @@ export class LogicalReplicationClient {
         } else if (buffer[0] === 0x6b) {
           // Primary keepalive message
           const timestamp = Math.floor(
-            buffer.readUInt32BE(9) * 4294967.296 + buffer.readUInt32BE(13) / 1000 + 946080000000
+            buffer.readUInt32BE(9) * 4294967.296 + buffer.readUInt32BE(13) / 1000 + 946684800000
           );
           const shouldRespond = !!buffer.readInt8(17);
           this.events.emit("heartbeat", { lsn, timestamp, shouldRespond });
@@ -658,7 +658,7 @@ export class LogicalReplicationClient {
       const slice = lsn.split("/");
       let [upperWAL, lowerWAL]: [number, number] = [parseInt(slice[0], 16), parseInt(slice[1], 16)];
       // Timestamp as microseconds since midnight 2000-01-01
-      const now = Date.now() - 946080000000;
+      const now = Date.now() - 946684800000;
       const upperTimestamp = Math.floor(now / 4294967.296);
       const lowerTimestamp = Math.floor(now - upperTimestamp * 4294967.296);
       if (lowerWAL === 4294967295) {
diff --git a/internal-packages/run-engine/src/run-queue/fairQueueSelectionStrategy.ts b/internal-packages/run-engine/src/run-queue/fairQueueSelectionStrategy.ts
index 0e2205e413a..65217d54630 100644
--- a/internal-packages/run-engine/src/run-queue/fairQueueSelectionStrategy.ts
+++ b/internal-packages/run-engine/src/run-queue/fairQueueSelectionStrategy.ts
@@ -226,6 +226,7 @@ export class FairQueueSelectionStrategy implements RunQueueSelectionStrategy {
 
       // Add selected item to result and remove from items
       result.push(items[index].envId);
+      totalWeight -= items[index].weight;
       items.splice(index, 1);
     }