diff --git a/eval/plot.py b/eval/plot.py
index 8a9bcc1c16392af712c1711b9d462c6a76699d76..35f16fca45143895fb766ae351293849d4697f74 100644
--- a/eval/plot.py
+++ b/eval/plot.py
@@ -29,10 +29,11 @@ def get_stats(l):
 def plot(means, stdevs, mins, maxs, title, label, loc):
     plt.title(title)
     plt.xlabel("communication rounds")
-    x_axis = list(means.keys())
-    y_axis = list(means.values())
-    err = list(stdevs.values())
-    plt.errorbar(x_axis, y_axis, yerr=err, label=label)
+    x_axis = np.array(list(means.keys()))
+    y_axis = np.array(list(means.values()))
+    err = np.array(list(stdevs.values()))
+    plt.plot(x_axis, y_axis, label=label)
+    plt.fill_between(x_axis, y_axis - err, y_axis + err, alpha=0.4)
     plt.legend(loc=loc)
 
 
diff --git a/src/decentralizepy/node/DPSGDWithPeerSampler.py b/src/decentralizepy/node/DPSGDWithPeerSampler.py
index 2508675a5ae0815eadb1bbf32b7e7cf33eeece50..d4e926c4c0515c617e86a10d20666bf8cb5cbd1a 100644
--- a/src/decentralizepy/node/DPSGDWithPeerSampler.py
+++ b/src/decentralizepy/node/DPSGDWithPeerSampler.py
@@ -154,7 +154,7 @@ class DPSGDWithPeerSampler(DPSGDNode):
         """
         if not self.sent_disconnections:
             logging.info("Disconnecting neighbors")
-            for uid in self.my_neighbors:
+            for uid in self.barrier:
                 self.communication.send(uid, {"BYE": self.uid, "CHANNEL": "DISCONNECT"})
             self.communication.send(
                 self.peer_sampler_uid, {"BYE": self.uid, "CHANNEL": "SERVER_REQUEST"}
diff --git a/src/decentralizepy/node/Node.py b/src/decentralizepy/node/Node.py
index 305064ec4953697248451d9ed2cf36d5fb62f580..145b36297909314c663cc3402e9cd4c0205c1dc5 100644
--- a/src/decentralizepy/node/Node.py
+++ b/src/decentralizepy/node/Node.py
@@ -108,7 +108,7 @@ class Node:
         """
         if not self.sent_disconnections:
             logging.info("Disconnecting neighbors")
-            for uid in self.my_neighbors:
+            for uid in self.barrier:
                 self.communication.send(uid, {"BYE": self.uid, "CHANNEL": "DISCONNECT"})
             self.sent_disconnections = True
             while len(self.barrier):
diff --git a/src/decentralizepy/node/PeerSampler.py b/src/decentralizepy/node/PeerSampler.py
index 6c76156e2d58251f1b17388a0dc3f4ed02d8da6a..1311a26706b2f44303ab3a291850f2641b870b68 100644
--- a/src/decentralizepy/node/PeerSampler.py
+++ b/src/decentralizepy/node/PeerSampler.py
@@ -258,3 +258,5 @@ class PeerSampler(Node):
         )
 
         self.run()
+
+        logging.info("Peer Sampler exiting")
diff --git a/src/decentralizepy/node/PeerSamplerDynamic.py b/src/decentralizepy/node/PeerSamplerDynamic.py
index 9c9dc83e363d33e14a746d505e54051660fef752..ffee60a526a97d77d9d7d633b86bbccad7568cc7 100644
--- a/src/decentralizepy/node/PeerSamplerDynamic.py
+++ b/src/decentralizepy/node/PeerSamplerDynamic.py
@@ -96,3 +96,5 @@ class PeerSamplerDynamic(PeerSampler):
         )
 
         self.run()
+
+        logging.info("Peer Sampler exiting")