diff --git a/backend/windmill-api/src/job_ops_impl.rs b/backend/windmill-api/src/job_ops_impl.rs
index 4ee53776b8..e18418132b 100644
--- a/backend/windmill-api/src/job_ops_impl.rs
+++ b/backend/windmill-api/src/job_ops_impl.rs
@@ -151,9 +151,13 @@ impl JobOps for JobOpsImpl {
             while let Some(msg) = bridge_rx.recv().await {
                 let converted = match msg {
                     crate::jobs::JobUpdateSSEStream::Update(update) => {
-                        JobUpdateSSEStream::Update(
-                            serde_json::to_value(&update).unwrap_or_default(),
-                        )
+                        match serde_json::to_value(&update) {
+                            Ok(v) => JobUpdateSSEStream::Update(v),
+                            Err(e) => {
+                                tracing::error!("Failed to serialize SSE job update: {e}");
+                                continue;
+                            }
+                        }
                     }
                     crate::jobs::JobUpdateSSEStream::Error { error } => {
                         JobUpdateSSEStream::Error { error }
diff --git a/backend/windmill-api/src/jobs.rs b/backend/windmill-api/src/jobs.rs
index 2feb6b2858..96b779218c 100644
--- a/backend/windmill-api/src/jobs.rs
+++ b/backend/windmill-api/src/jobs.rs
@@ -3849,7 +3849,7 @@ pub fn add_raw_string(
 
 pub use windmill_triggers::jobs_ext::check_tag_available_for_workspace;
 
-#[cfg(feature = "enterprise")]
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 pub use windmill_common::ee_oss::check_license_key_valid;
 
 use windmill_common::flows::InputTransform;
diff --git a/backend/windmill-triggers/src/jobs_ext.rs b/backend/windmill-triggers/src/jobs_ext.rs
index a6239114f8..792d705a0a 100644
--- a/backend/windmill-triggers/src/jobs_ext.rs
+++ b/backend/windmill-triggers/src/jobs_ext.rs
@@ -30,7 +30,7 @@ use windmill_queue::PushArgsOwned;
 // Re-export shared types/functions from windmill-common
 pub use windmill_common::jobs::{delete_job_metadata_after_use, RunJobQuery};
 
-#[cfg(feature = "enterprise")]
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 pub use windmill_common::ee_oss::check_license_key_valid;
 
 // Re-export scope helpers from windmill-api-auth
diff --git a/backend/windmill-triggers/src/triggers/trigger_helpers.rs b/backend/windmill-triggers/src/triggers/trigger_helpers.rs
index 218ad71264..5ad3e548d7 100644
--- a/backend/windmill-triggers/src/triggers/trigger_helpers.rs
+++ b/backend/windmill-triggers/src/triggers/trigger_helpers.rs
@@ -24,7 +24,7 @@ use windmill_common::{
 };
 use windmill_queue::{push, PushArgs, PushArgsOwned, PushIsolationLevel};
 
-#[cfg(feature = "enterprise")]
+#[cfg(all(feature = "enterprise", not(feature = "private")))]
 use crate::jobs_ext::check_license_key_valid;
 use crate::jobs_ext::{
     check_tag_available_for_workspace, delete_job_metadata_after_use,
@@ -829,7 +829,7 @@ async fn trigger_script_with_retry_and_error_handler(
     Option<bool>,
     Option<sqlx::Transaction<'static, sqlx::Postgres>>,
 )> {
-    #[cfg(feature = "enterprise")]
+    #[cfg(all(feature = "enterprise", not(feature = "private")))]
     check_license_key_valid().await?;
 
     check_scopes(&authed, || format!("jobs:run:scripts:{script_path}"))?;