diff --git a/src/callers/coverart.rs b/src/callers/coverart.rs
index fec5fed..553b254 100644
--- a/src/callers/coverart.rs
+++ b/src/callers/coverart.rs
@@ -185,18 +185,15 @@ pub mod endpoint {
                                 if file_type.file_type
                                     == icarus_meta::detection::coverart::constants::JPEG_TYPE
                                 {
-                                    (
-                                        file_type,
-                                        icarus_models::types::CoverArtTypes::JpegExtension,
-                                    )
+                                    (file_type, icarus_models::types::CoverArtType::JpegExtension)
                                 } else if file_type.file_type
                                     == icarus_meta::detection::coverart::constants::JPG_TYPE
                                 {
-                                    (file_type, icarus_models::types::CoverArtTypes::JpgExtension)
+                                    (file_type, icarus_models::types::CoverArtType::JpgExtension)
                                 } else if file_type.file_type
                                     == icarus_meta::detection::coverart::constants::PNG_TYPE
                                 {
-                                    (file_type, icarus_models::types::CoverArtTypes::PngExtension)
+                                    (file_type, icarus_models::types::CoverArtType::PngExtension)
                                 } else {
                                     return (
                                         axum::http::StatusCode::INTERNAL_SERVER_ERROR,
@@ -215,7 +212,8 @@ pub mod endpoint {
                     let bytes = axum::body::Bytes::from(data);
                     let mut response = bytes.into_response();
                     let headers = response.headers_mut();
-                    let filename = icarus_models::coverart::generate_filename(img_type, true);
+                    let filename =
+                        icarus_models::coverart::generate_filename(img_type, true).unwrap();
                     headers.insert(
                         axum::http::header::CONTENT_TYPE,
                         file_type.mime.parse().unwrap(),
diff --git a/src/callers/song.rs b/src/callers/song.rs
index db97d00..69da51b 100644
--- a/src/callers/song.rs
+++ b/src/callers/song.rs
@@ -135,9 +135,10 @@ pub mod endpoint {
         if payload.is_valid() {
             let mut song = payload.to_song();
             song.filename = icarus_models::song::generate_filename(
-                icarus_models::types::MusicTypes::FlacExtension,
+                icarus_models::types::MusicType::FlacExtension,
                 true,
-            );
+            )
+            .unwrap();
             song.directory = icarus_envy::environment::get_root_directory().await.value;
 
             match repo_queue::song::get_data(&pool, &payload.song_queue_id).await {
diff --git a/src/repo/coverart.rs b/src/repo/coverart.rs
index 2032f1d..8ed25a2 100644
--- a/src/repo/coverart.rs
+++ b/src/repo/coverart.rs
@@ -115,6 +115,7 @@ pub async fn get_coverart_with_song_id(
                 .try_get("song_id")
                 .map_err(|_e| sqlx::Error::RowNotFound)
                 .unwrap(),
+            ..Default::default()
         }),
         Err(_) => Err(sqlx::Error::RowNotFound),
     }
@@ -161,6 +162,7 @@ pub async fn delete_coverart(
                 .map_err(|_e| sqlx::Error::RowNotFound)
                 .unwrap(),
             data: Vec::new(),
+            ..Default::default()
         }),
         Err(_err) => Err(sqlx::Error::RowNotFound),
     }