diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 2c2dd24c09475..3a0cb42f5ac31 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -48,8 +48,8 @@ lto = "thin"
 [features]
 default = []
 enterprise = ["windmill-worker/enterprise", "windmill-queue/enterprise", "windmill-api/enterprise", "dep:windmill-autoscaling", "windmill-autoscaling/enterprise", "windmill-git-sync/enterprise", "windmill-common/prometheus", "windmill-common/enterprise"]
-enterprise_saml = ["windmill-api/enterprise_saml"]
-stripe = ["windmill-api/stripe"]
+enterprise_saml = ["windmill-api/enterprise_saml", "oauth2"]
+stripe = ["windmill-api/stripe", "enterprise"]
 benchmark = ["windmill-api/benchmark", "windmill-worker/benchmark", "windmill-queue/benchmark", "windmill-common/benchmark"]
 loki = ["windmill-common/loki"]
 embedding = ["windmill-api/embedding"]
@@ -59,7 +59,7 @@ flow_testing = ["windmill-worker/flow_testing"]
 openidconnect = ["windmill-api/openidconnect"]
 cloud = ["windmill-queue/cloud", "windmill-worker/cloud"]
 jemalloc = ["windmill-common/jemalloc", "dep:tikv-jemallocator", "dep:tikv-jemalloc-sys", "dep:tikv-jemalloc-ctl"]
-tantivy = ["dep:windmill-indexer", "windmill-api/tantivy", "windmill-indexer/enterprise", "windmill-indexer/parquet"]
+tantivy = ["dep:windmill-indexer", "windmill-api/tantivy", "windmill-indexer/enterprise", "windmill-indexer/parquet", "enterprise", "parquet"]
 sqlx = ["windmill-worker/sqlx"]
 deno_core = ["windmill-worker/deno_core", "dep:deno_core"]
 kafka = ["windmill-api/kafka"]
diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index 086d275fc1e32..8ad7ae3e0348b 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-324617e19a5906fe57c911c8df4fb63786a1634a
\ No newline at end of file
+d83f0ad88f0c63a97ab5f30382d563db6112a998
\ No newline at end of file
diff --git a/backend/windmill-api/Cargo.toml b/backend/windmill-api/Cargo.toml
index ee2f0419bfc9c..95778875d8783 100644
--- a/backend/windmill-api/Cargo.toml
+++ b/backend/windmill-api/Cargo.toml
@@ -26,7 +26,7 @@ license = ["dep:rsa"]
 zip = ["dep:async_zip"]
 oauth2 = ["dep:async-oauth2"]
 http_trigger = ["dep:matchit"]
-static_frontend = ["dep:rust-embed", "dep:mime_guess"]
+static_frontend = ["dep:rust-embed"]
 
 [dependencies]
 windmill-queue.workspace = true
@@ -61,7 +61,7 @@ base64.workspace = true
 base32.workspace = true
 serde_urlencoded.workspace = true
 cron.workspace = true
-mime_guess = { workspace = true, optional = true }
+mime_guess.workspace = true
 rust-embed = { workspace = true, optional = true }
 tracing-subscriber.workspace = true
 quick_cache.workspace = true
diff --git a/backend/windmill-queue/src/jobs.rs b/backend/windmill-queue/src/jobs.rs
index a41ad14c4ea65..1592eebe20428 100644
--- a/backend/windmill-queue/src/jobs.rs
+++ b/backend/windmill-queue/src/jobs.rs
@@ -119,7 +119,7 @@ const SCHEDULE_RECOVERY_HANDLER_USERNAME: &str = "schedule_recovery_handler";
 const ERROR_HANDLER_USER_GROUP: &str = "g/error_handler";
 const ERROR_HANDLER_USER_EMAIL: &str = "error_handler@windmill.dev";
 const SCHEDULE_ERROR_HANDLER_USER_EMAIL: &str = "schedule_error_handler@windmill.dev";
-#[cfg(feature = "enterprise")]
+#[cfg(any(feature = "enterprise", feature = "cloud"))]
 const SCHEDULE_RECOVERY_HANDLER_USER_EMAIL: &str = "schedule_recovery_handler@windmill.dev";
 
 #[derive(Clone, Debug)]