diff --git a/Cargo.lock b/Cargo.lock
index 43e56261f..b5e5132f3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1974,7 +1974,7 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "logdna-agent"
-version = "3.8.7"
+version = "3.8.8"
 dependencies = [
  "anyhow",
  "assert_cmd",
diff --git a/bin/Cargo.toml b/bin/Cargo.toml
index f340ab1d3..f2e5e9650 100644
--- a/bin/Cargo.toml
+++ b/bin/Cargo.toml
@@ -10,7 +10,7 @@
 
 [package]
 name = "logdna-agent"
-version = "3.8.7"
+version = "3.8.8"
 authors = ["CJP10 <connor.peticca@logdna.com>"]
 edition = "2018"
 build = "build.rs"
diff --git a/common/config/src/lib.rs b/common/config/src/lib.rs
index 2d22626b5..dbebb17a5 100644
--- a/common/config/src/lib.rs
+++ b/common/config/src/lib.rs
@@ -93,21 +93,16 @@ pub struct HttpConfig {
     pub retry_step_delay: Duration,
 }
 
-#[derive(Clone, Display, core::fmt::Debug, Eq, PartialEq, EnumString)]
+#[derive(Clone, Default, Display, core::fmt::Debug, Eq, PartialEq, EnumString)]
 pub enum K8sTrackingConf {
     #[strum(serialize = "always")]
     Always,
 
     #[strum(serialize = "never")]
+    #[default]
     Never,
 }
 
-impl Default for K8sTrackingConf {
-    fn default() -> Self {
-        K8sTrackingConf::Never
-    }
-}
-
 #[derive(Debug)]
 pub struct LogConfig {
     pub dirs: Vec<DirPathBuf>,
@@ -132,9 +127,10 @@ pub struct JournaldConfig {
     pub systemd_journal_tailer: bool,
 }
 
-#[derive(Clone, core::fmt::Debug, Display, EnumString, Eq, PartialEq)]
+#[derive(Clone, Default, core::fmt::Debug, Display, EnumString, Eq, PartialEq)]
 pub enum K8sLeaseConf {
     #[strum(serialize = "never")]
+    #[default]
     Never,
 
     #[strum(serialize = "attempt")]
@@ -144,12 +140,6 @@ pub enum K8sLeaseConf {
     Always,
 }
 
-impl Default for K8sLeaseConf {
-    fn default() -> Self {
-        K8sLeaseConf::Never
-    }
-}
-
 const LOGDNA_PREFIX: &str = "LOGDNA_";
 const MEZMO_PREFIX: &str = "MZ_";
 
diff --git a/common/fs/src/cache/mod.rs b/common/fs/src/cache/mod.rs
index e1af1695c..26853cb4f 100755
--- a/common/fs/src/cache/mod.rs
+++ b/common/fs/src/cache/mod.rs
@@ -313,7 +313,7 @@ impl FileSystem {
         let (resume_events_send, resume_events_recv) = async_channel::unbounded();
         let (retry_events_send, retry_events_recv) = async_channel::unbounded();
 
-        let mut initial_dirs_checked = initial_dirs_original.clone();
+        let mut initial_dirs_checked = initial_dirs_original;
         initial_dirs_checked.iter_mut().for_each(|path| {
             // if postfix is Some then dir does not exists
             // check again if non-existing path exists now
diff --git a/common/fs/src/lookback.rs b/common/fs/src/lookback.rs
index 9342c53e8..a48538fca 100644
--- a/common/fs/src/lookback.rs
+++ b/common/fs/src/lookback.rs
@@ -1,11 +1,12 @@
 use std::fmt;
 use thiserror::Error;
 
-#[derive(Clone, std::fmt::Debug, Eq, PartialEq)]
+#[derive(Clone, Default, std::fmt::Debug, Eq, PartialEq)]
 pub enum Lookback {
     Start,
     SmallFiles,
     Tail,
+    #[default]
     None,
 }
 
@@ -48,9 +49,3 @@ impl fmt::Display for Lookback {
         )
     }
 }
-
-impl Default for Lookback {
-    fn default() -> Self {
-        Lookback::None
-    }
-}
diff --git a/common/http/src/batch.rs b/common/http/src/batch.rs
index 3557c9c49..74954eede 100644
--- a/common/http/src/batch.rs
+++ b/common/http/src/batch.rs
@@ -439,9 +439,7 @@ mod tests {
                     .unwrap();
                 let mut body: HashMap<String, Vec<Line>> = serde_json::from_str(&buf).unwrap();
                 body.remove("lines").unwrap_or_default()
-            })
-                .into_iter()
-                .flatten();
+            });
 
             assert_eq!(all_results.count(), size);
         }
diff --git a/common/http/src/retry.rs b/common/http/src/retry.rs
index 3528537e2..1fc9bf7f5 100644
--- a/common/http/src/retry.rs
+++ b/common/http/src/retry.rs
@@ -470,7 +470,7 @@ mod tests {
                 .collect::<Vec<_>>();
 
             // Grab results and check we got them all
-            let stream_results = results.into_iter().map(move |body_offsets|{
+            let stream_results = results.into_iter().flat_map(move |body_offsets|{
                 let mut buf = String::new();
                 let (body, _offsets) = body_offsets.unwrap();
                 body.reader()
@@ -479,8 +479,6 @@ mod tests {
                 let mut body: HashMap<String, Vec<Line>> = serde_json::from_str(&buf).unwrap();
                 body.remove("lines").unwrap_or_default()
             })
-                .into_iter()
-                .flatten()
                 .collect::<Vec<_>>();
 
             let lines_set: HashSet<String> = lines.iter().map(|l|l.line.clone()).collect::<HashSet<_>>();
@@ -490,7 +488,7 @@ mod tests {
             assert_eq!(lines_set, l);
 
             // Grab retries and check we got them all
-            let retry_results = retry_results.into_iter().map(move |body_offsets|{
+            let retry_results = retry_results.into_iter().flat_map(move |body_offsets|{
                 let mut buf = String::new();
                 let body = body_offsets.unwrap();
                 body.body_buffer.reader()
@@ -499,8 +497,6 @@ mod tests {
                 let mut body: HashMap<String, Vec<Line>> = serde_json::from_str(&buf).unwrap();
                 body.remove("lines").unwrap_or_default()
             })
-                .into_iter()
-                .flatten()
                 .collect::<Vec<_>>();
             let r: HashSet<String> = retry_results.iter().map(|r|r.line.clone()).collect::<HashSet<_>>();
 
diff --git a/k8s/agent-namespace.yaml b/k8s/agent-namespace.yaml
index a3b95d15e..da8815ca0 100644
--- a/k8s/agent-namespace.yaml
+++ b/k8s/agent-namespace.yaml
@@ -5,4 +5,4 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
diff --git a/k8s/agent-resources-no-cap.yaml b/k8s/agent-resources-no-cap.yaml
index e78e82b30..b6fa1b15f 100644
--- a/k8s/agent-resources-no-cap.yaml
+++ b/k8s/agent-resources-no-cap.yaml
@@ -17,7 +17,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -27,7 +27,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 rules:
   - apiGroups: [""]
     resources: ["configmaps"]
@@ -41,7 +41,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -58,7 +58,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 rules:
   - apiGroups: [""]
     resources: ["events"]
@@ -74,7 +74,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -92,7 +92,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 spec:
   updateStrategy:
     type: RollingUpdate
@@ -107,13 +107,13 @@ spec:
         app: logdna-agent
         app.kubernetes.io/name: logdna-agent
         app.kubernetes.io/instance: logdna-agent
-        app.kubernetes.io/version: 3.8.7
+        app.kubernetes.io/version: 3.8.8
     spec:
       serviceAccountName: logdna-agent
       priorityClassName: logdna-agent-ds-priority
       containers:
         - name: logdna-agent
-          image: logdna/logdna-agent:3.8.7
+          image: logdna/logdna-agent:3.8.8
           imagePullPolicy: Always
           securityContext:
             capabilities:
diff --git a/k8s/agent-resources-openshift-supertenant.yaml b/k8s/agent-resources-openshift-supertenant.yaml
index 1b588c11a..519d65051 100644
--- a/k8s/agent-resources-openshift-supertenant.yaml
+++ b/k8s/agent-resources-openshift-supertenant.yaml
@@ -17,7 +17,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 rules:
   - apiGroups: [""]
     resources: ["configmaps"]
@@ -31,7 +31,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -48,7 +48,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 rules:
   - apiGroups: [""]
     resources: ["events"]
@@ -64,7 +64,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -82,7 +82,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 spec:
   updateStrategy:
     type: RollingUpdate
@@ -97,13 +97,13 @@ spec:
         app: logdna-agent
         app.kubernetes.io/name: logdna-agent
         app.kubernetes.io/instance: logdna-agent
-        app.kubernetes.io/version: 3.8.7
+        app.kubernetes.io/version: 3.8.8
     spec:
       serviceAccountName: logdna-agent
       priorityClassName: logdna-agent-ds-priority
       containers:
         - name: logdna-agent
-          image: logdna/logdna-agent:3.8.7
+          image: logdna/logdna-agent:3.8.8
           imagePullPolicy: Always
           securityContext:
             privileged: true
diff --git a/k8s/agent-resources-openshift.yaml b/k8s/agent-resources-openshift.yaml
index a19cacd88..759e0c86e 100644
--- a/k8s/agent-resources-openshift.yaml
+++ b/k8s/agent-resources-openshift.yaml
@@ -17,7 +17,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 rules:
   - apiGroups: [""]
     resources: ["configmaps"]
@@ -31,7 +31,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -48,7 +48,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 rules:
   - apiGroups: [""]
     resources: ["events"]
@@ -64,7 +64,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -82,7 +82,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 spec:
   updateStrategy:
     type: RollingUpdate
@@ -97,13 +97,13 @@ spec:
         app: logdna-agent
         app.kubernetes.io/name: logdna-agent
         app.kubernetes.io/instance: logdna-agent
-        app.kubernetes.io/version: 3.8.7
+        app.kubernetes.io/version: 3.8.8
     spec:
       serviceAccountName: logdna-agent
       priorityClassName: logdna-agent-ds-priority
       containers:
         - name: logdna-agent
-          image: logdna/logdna-agent:3.8.7
+          image: logdna/logdna-agent:3.8.8
           imagePullPolicy: Always
           securityContext:
             privileged: true
diff --git a/k8s/agent-resources-supertenant.yaml b/k8s/agent-resources-supertenant.yaml
index 30a48634a..f51098205 100644
--- a/k8s/agent-resources-supertenant.yaml
+++ b/k8s/agent-resources-supertenant.yaml
@@ -17,7 +17,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -27,7 +27,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 rules:
   - apiGroups: [""]
     resources: ["configmaps"]
@@ -41,7 +41,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -58,7 +58,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 rules:
   - apiGroups: [""]
     resources: ["events"]
@@ -74,7 +74,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -92,7 +92,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 spec:
   updateStrategy:
     type: RollingUpdate
@@ -107,13 +107,13 @@ spec:
         app: logdna-agent
         app.kubernetes.io/name: logdna-agent
         app.kubernetes.io/instance: logdna-agent
-        app.kubernetes.io/version: 3.8.7
+        app.kubernetes.io/version: 3.8.8
     spec:
       serviceAccountName: logdna-agent
       priorityClassName: logdna-agent-ds-priority
       containers:
         - name: logdna-agent
-          image: logdna/logdna-agent:3.8.7
+          image: logdna/logdna-agent:3.8.8
           imagePullPolicy: Always
           securityContext:
             capabilities:
diff --git a/k8s/agent-resources.yaml b/k8s/agent-resources.yaml
index 94705b39d..69756c288 100644
--- a/k8s/agent-resources.yaml
+++ b/k8s/agent-resources.yaml
@@ -17,7 +17,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -27,7 +27,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 rules:
   - apiGroups: [""]
     resources: ["configmaps"]
@@ -41,7 +41,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -58,7 +58,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 rules:
   - apiGroups: [""]
     resources: ["events"]
@@ -83,7 +83,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -101,7 +101,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 spec:
   updateStrategy:
     type: RollingUpdate
@@ -116,13 +116,13 @@ spec:
         app: logdna-agent
         app.kubernetes.io/name: logdna-agent
         app.kubernetes.io/instance: logdna-agent
-        app.kubernetes.io/version: 3.8.7
+        app.kubernetes.io/version: 3.8.8
     spec:
       serviceAccountName: logdna-agent
       priorityClassName: logdna-agent-ds-priority
       containers:
         - name: logdna-agent
-          image: logdna/logdna-agent:3.8.7
+          image: logdna/logdna-agent:3.8.8
           imagePullPolicy: Always
           securityContext:
             capabilities:
diff --git a/k8s/mock-ingester.yaml b/k8s/mock-ingester.yaml
index 4bde4ba80..c77f4e56b 100644
--- a/k8s/mock-ingester.yaml
+++ b/k8s/mock-ingester.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -16,7 +16,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -26,7 +26,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 rules:
   - apiGroups: [""]
     resources: ["configmaps"]
@@ -40,7 +40,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -57,7 +57,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 rules:
   - apiGroups: [""]
     resources: ["events"]
@@ -73,7 +73,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -91,7 +91,7 @@ metadata:
   labels:
     app.kubernetes.io/name: logdna-agent
     app.kubernetes.io/instance: logdna-agent
-    app.kubernetes.io/version: 3.8.7
+    app.kubernetes.io/version: 3.8.8
 spec:
   updateStrategy:
     type: RollingUpdate
@@ -106,12 +106,12 @@ spec:
         app: logdna-agent
         app.kubernetes.io/name: logdna-agent
         app.kubernetes.io/instance: logdna-agent
-        app.kubernetes.io/version: 3.8.7
+        app.kubernetes.io/version: 3.8.8
     spec:
       serviceAccountName: logdna-agent
       containers:
         - name: logdna-agent
-          image: logdna/logdna-agent:3.8.7
+          image: logdna/logdna-agent:3.8.8
           imagePullPolicy: Always
           env:
             - name: LOGDNA_INGESTION_KEY