diff --git a/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/workload/trace/SimTraceWorkload.java b/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/workload/trace/SimTraceWorkload.java
index b6d939c9b..46354d4c9 100644
--- a/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/workload/trace/SimTraceWorkload.java
+++ b/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/workload/trace/SimTraceWorkload.java
@@ -124,6 +124,10 @@ public long onUpdate(long now) {
         long remainingDuration = this.scalingPolicy.getRemainingDuration(
                 this.cpuFreqDemand, this.newCpuFreqSupplied, this.remainingWork);
 
+        if (remainingDuration == 0.0) {
+            this.remainingWork = 0.0;
+        }
+
         return now + remainingDuration;
     }
 
diff --git a/opendc-simulator/opendc-simulator-flow/src/main/java/org/opendc/simulator/engine/graph/FlowDistributor.java b/opendc-simulator/opendc-simulator-flow/src/main/java/org/opendc/simulator/engine/graph/FlowDistributor.java
index ff7ff1996..dcbd79bbb 100644
--- a/opendc-simulator/opendc-simulator-flow/src/main/java/org/opendc/simulator/engine/graph/FlowDistributor.java
+++ b/opendc-simulator/opendc-simulator-flow/src/main/java/org/opendc/simulator/engine/graph/FlowDistributor.java
@@ -39,8 +39,7 @@ public class FlowDistributor extends FlowNode implements FlowSupplier, FlowConsu
     private double currentIncomingSupply; // The current supply provided by the supplier
 
     private boolean outgoingDemandUpdateNeeded = false;
-    private final Set<Integer> updatedDemands =
-            new HashSet<>(); // Array of consumers that updated their demand in this cycle
+    private Set<Integer> updatedDemands = new HashSet<>(); // Array of consumers that updated their demand in this cycle
 
     private boolean overloaded = false;
 
@@ -209,14 +208,18 @@ public void removeConsumerEdge(FlowEdge consumerEdge) {
             other.setConsumerIndex(other.getConsumerIndex() - 1);
         }
 
-        for (int idx_other : this.updatedDemands) {
+        HashSet newUpdatedDemands = new HashSet<>();
 
+        for (int idx_other : this.updatedDemands) {
             if (idx_other > idx) {
-                this.updatedDemands.remove(idx_other);
-                this.updatedDemands.add(idx_other - 1);
+                newUpdatedDemands.add(idx_other - 1);
+            } else {
+                newUpdatedDemands.add(idx_other);
             }
         }
 
+        this.updatedDemands = newUpdatedDemands;
+
         this.outgoingDemandUpdateNeeded = true;
         this.invalidate();
     }