diff --git a/bin/core/src/helpers/sync/mod.rs b/bin/core/src/helpers/sync/mod.rs
index 514d5176f..2734e3c94 100644
--- a/bin/core/src/helpers/sync/mod.rs
+++ b/bin/core/src/helpers/sync/mod.rs
@@ -64,7 +64,9 @@ impl std::fmt::Display for Color {
   fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
     match self {
       Color::Red => f.write_str("text-red-700 dark:text-red-400"),
-      Color::Green => f.write_str("text-green-700 dark:text-green-400"),
+      Color::Green => {
+        f.write_str("text-green-700 dark:text-green-400")
+      }
       Color::Blue => f.write_str("text-blue-700 dark:text-blue-400"),
     }
   }
diff --git a/bin/core/src/helpers/sync/resource.rs b/bin/core/src/helpers/sync/resource.rs
index 5346041c5..9c84d9c57 100644
--- a/bin/core/src/helpers/sync/resource.rs
+++ b/bin/core/src/helpers/sync/resource.rs
@@ -300,8 +300,10 @@ pub async fn get_updates_for_view<Resource: ResourceSync>(
           ));
         }
         if resource.tags != original_tags {
-          let from = colored(&format!("{:?}", original_tags), Color::Red);
-          let to = colored(&format!("{:?}", resource.tags), Color::Green);
+          let from =
+            colored(&format!("{:?}", original_tags), Color::Red);
+          let to =
+            colored(&format!("{:?}", resource.tags), Color::Green);
           lines.push(format!(
             "{}: 'tags'\n{}:  {from}\n{}:    {to}",
             muted("field"),
diff --git a/bin/core/src/helpers/sync/resources.rs b/bin/core/src/helpers/sync/resources.rs
index 5fcb6e425..28d9d6827 100644
--- a/bin/core/src/helpers/sync/resources.rs
+++ b/bin/core/src/helpers/sync/resources.rs
@@ -22,7 +22,8 @@ use crate::{
     resource::{
       run_update_description, run_update_tags, ResourceSync,
       ToUpdateItem,
-    }, Color,
+    },
+    Color,
   },
   resource::MonitorResource,
 };
diff --git a/bin/core/src/helpers/sync/user_groups.rs b/bin/core/src/helpers/sync/user_groups.rs
index d3685cb61..fcbed18c3 100644
--- a/bin/core/src/helpers/sync/user_groups.rs
+++ b/bin/core/src/helpers/sync/user_groups.rs
@@ -22,7 +22,9 @@ use resolver_api::Resolve;
 
 use crate::state::{db_client, State};
 
-use super::{bold, colored, muted, resource::AllResourcesById, Color};
+use super::{
+  bold, colored, muted, resource::AllResourcesById, Color,
+};
 
 pub struct UpdateItem {
   user_group: UserGroupToml,
diff --git a/client/core/rs/src/entities/deployment.rs b/client/core/rs/src/entities/deployment.rs
index 8b8c361be..c47b1d9ed 100644
--- a/client/core/rs/src/entities/deployment.rs
+++ b/client/core/rs/src/entities/deployment.rs
@@ -307,7 +307,7 @@ pub fn conversions_from_str(
     .split('\n')
     .map(|line| line.trim())
     .enumerate()
-    .filter(|(_, line)| !line.starts_with('#'))
+    .filter(|(_, line)| !line.is_empty() && !line.starts_with('#'))
     .map(|(i, line)| {
       let mut split = line.split('=');
       let local = split
@@ -616,7 +616,7 @@ pub fn term_signal_labels_from_str(
     .split('\n')
     .map(|line| line.trim())
     .enumerate()
-    .filter(|(_, line)| !line.starts_with('#'))
+    .filter(|(_, line)| !line.is_empty() && !line.starts_with('#'))
     .map(|(i, line)| {
       let mut split = line.split('=');
       let signal = split
diff --git a/client/core/rs/src/entities/mod.rs b/client/core/rs/src/entities/mod.rs
index 77ed6c95f..1f155a454 100644
--- a/client/core/rs/src/entities/mod.rs
+++ b/client/core/rs/src/entities/mod.rs
@@ -355,7 +355,7 @@ pub fn environment_vars_from_str(
     .split('\n')
     .map(|line| line.trim())
     .enumerate()
-    .filter(|(_, line)| !line.starts_with('#'))
+    .filter(|(_, line)| !line.is_empty() && !line.starts_with('#'))
     .map(|(i, line)| {
       let mut split = line.split('=');
       let variable = split