diff --git a/mixnode/src/node/metrics.rs b/mixnode/src/node/metrics.rs
index 3bb5b97c82..cf8e52e942 100644
--- a/mixnode/src/node/metrics.rs
+++ b/mixnode/src/node/metrics.rs
@@ -17,6 +17,8 @@ pub(crate) enum MetricEvent {
 }
 
 #[derive(Debug, Clone)]
+// Note: you should NEVER create more than a single instance of this using 'new()'.
+// You should always use .clone() to create additional instances
 struct MixMetrics {
     inner: Arc<Mutex<MixMetricsInner>>,
 }
diff --git a/sfw-provider/src/provider/storage/mod.rs b/sfw-provider/src/provider/storage/mod.rs
index 6b2725a25d..458e4e1061 100644
--- a/sfw-provider/src/provider/storage/mod.rs
+++ b/sfw-provider/src/provider/storage/mod.rs
@@ -50,6 +50,9 @@ impl StoreData {
 }
 
 // TODO: replace with proper database...
+// Note: you should NEVER create more than a single instance of this using 'new()'.
+// You should always use .clone() to create additional instances
+#[derive(Clone, Debug)]
 pub struct ClientStorage {
     inner: Arc<Mutex<ClientStorageInner>>,
 }