diff --git a/core/examples/indexing_demo.rs b/core/examples/indexing_demo.rs
index 826cef222012..0cd81dd7e906 100644
--- a/core/examples/indexing_demo.rs
+++ b/core/examples/indexing_demo.rs
@@ -24,7 +24,7 @@ use std::path::PathBuf;
 use tokio::time::{sleep, Duration};
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error>> {
+async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
 	// Initialize logging with more detail
 	tracing_subscriber::fmt()
 		.with_env_filter("sd_core=debug,desktop_indexing_demo=info")
diff --git a/core/examples/job_logging_test.rs b/core/examples/job_logging_test.rs
index f89ef17a057b..0ade0d6eaa26 100644
--- a/core/examples/job_logging_test.rs
+++ b/core/examples/job_logging_test.rs
@@ -11,7 +11,7 @@ use std::path::PathBuf;
 use tokio::time::{sleep, Duration};
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error>> {
+async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
 	// Initialize logging
 	tracing_subscriber::fmt()
 		.with_env_filter("sd_core=debug")
diff --git a/core/examples/library_demo.rs b/core/examples/library_demo.rs
index 324386dfbaba..390142671f1e 100644
--- a/core/examples/library_demo.rs
+++ b/core/examples/library_demo.rs
@@ -6,7 +6,7 @@ use std::path::PathBuf;
 use uuid::Uuid;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error>> {
+async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
 	// Initialize logging
 	tracing_subscriber::fmt()
 		.with_env_filter("sd_core=debug")
@@ -125,7 +125,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 			accessed_at: Set(None),
 			indexed_at: Set(None),
 			permissions: Set(None),
-			device_id: Set(Some(inserted_device.id)),
+			volume_id: Set(None),
 			inode: Set(None),
 		};
 		let entry_record = entry.insert(db.conn()).await?;
@@ -135,6 +135,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 			id: NotSet,
 			uuid: Set(Uuid::new_v4()),
 			device_id: Set(inserted_device.id),
+			volume_id: Set(None),
 			entry_id: Set(Some(entry_record.id)),
 			name: Set(Some("Current Directory".to_string())),
 			index_mode: Set("shallow".to_string()),
diff --git a/core/examples/shutdown_demo.rs b/core/examples/shutdown_demo.rs
index b967a8b5091c..6397abaa618b 100644
--- a/core/examples/shutdown_demo.rs
+++ b/core/examples/shutdown_demo.rs
@@ -5,7 +5,7 @@ use std::time::Duration;
 use tokio::time::sleep;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error>> {
+async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
 	// Initialize logging
 	tracing_subscriber::fmt::init();
 
diff --git a/core/tests/event_system_test.rs b/core/tests/event_system_test.rs
index cb1d5a6b2179..240176073368 100644
--- a/core/tests/event_system_test.rs
+++ b/core/tests/event_system_test.rs
@@ -25,7 +25,7 @@ use tokio::sync::Mutex;
 use tokio::time::{timeout, Duration};
 
 #[tokio::test]
-async fn test_core_and_library_events() -> Result<(), Box<dyn std::error::Error>> {
+async fn test_core_and_library_events() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
 	let temp_dir = TempDir::new()?;
 
 	// Set up event collection
@@ -122,7 +122,7 @@ async fn test_core_and_library_events() -> Result<(), Box<dyn std::error::Error>
 }
 
 #[tokio::test]
-async fn test_location_and_job_events() -> Result<(), Box<dyn std::error::Error>> {
+async fn test_location_and_job_events() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
 	let temp_dir = TempDir::new()?;
 	let core = Core::new(temp_dir.path().to_path_buf()).await?;
 
@@ -241,7 +241,7 @@ async fn test_location_and_job_events() -> Result<(), Box<dyn std::error::Error>
 }
 
 #[tokio::test]
-async fn test_event_filtering() -> Result<(), Box<dyn std::error::Error>> {
+async fn test_event_filtering() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
 	let temp_dir = TempDir::new()?;
 	let core = Core::new(temp_dir.path().to_path_buf()).await?;
 
@@ -308,7 +308,8 @@ async fn test_event_filtering() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[tokio::test]
-async fn test_concurrent_event_subscribers() -> Result<(), Box<dyn std::error::Error>> {
+async fn test_concurrent_event_subscribers() -> Result<(), Box<dyn std::error::Error + Send + Sync>>
+{
 	let temp_dir = TempDir::new()?;
 	let core = Core::new(temp_dir.path().to_path_buf()).await?;
 
@@ -391,7 +392,7 @@ async fn test_concurrent_event_subscribers() -> Result<(), Box<dyn std::error::E
 }
 
 #[tokio::test]
-async fn test_custom_events() -> Result<(), Box<dyn std::error::Error>> {
+async fn test_custom_events() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
 	let temp_dir = TempDir::new()?;
 	let core = Core::new(temp_dir.path().to_path_buf()).await?;
 
diff --git a/core/tests/job_registration_test.rs b/core/tests/job_registration_test.rs
index 7f78308e242d..70c970f6feab 100644
--- a/core/tests/job_registration_test.rs
+++ b/core/tests/job_registration_test.rs
@@ -5,7 +5,6 @@ use sd_core::{
 	infra::job::{prelude::*, registry::REGISTRY},
 	ops::files::copy::job::FileCopyJob,
 };
-use uuid::Uuid;
 
 #[tokio::test]
 async fn test_job_registration() {
diff --git a/core/tests/phase_snapshot_test.rs b/core/tests/phase_snapshot_test.rs
index ed351de9f5d5..e111b3e48739 100644
--- a/core/tests/phase_snapshot_test.rs
+++ b/core/tests/phase_snapshot_test.rs
@@ -15,7 +15,7 @@ use std::{sync::Arc, time::Duration};
 use tempfile::TempDir;
 
 #[tokio::test]
-async fn capture_phase_snapshots() -> Result<(), Box<dyn std::error::Error>> {
+async fn capture_phase_snapshots() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
 	tracing_subscriber::fmt::init();
 	eprintln!("\nPHASE SNAPSHOT TEST - Indexing Desktop\n");
 	eprintln!("{}", "=".repeat(80));