diff --git a/src/attestation/src/binding.rs b/src/attestation/src/binding.rs
index 018113b8..84c6e77f 100644
--- a/src/attestation/src/binding.rs
+++ b/src/attestation/src/binding.rs
@@ -61,7 +61,8 @@ pub struct QveCollateral {
 
 #[cfg(not(feature = "test"))]
 mod attest_lib_binding {
-    use super::*;
+    #[cfg(feature = "attest-lib-ext")]
+    use super::QveCollateral;
 
     extern "C" {
         /// Get MigTD's Quote by passing tdx_report.
diff --git a/src/migtd/src/bin/migtd/main.rs b/src/migtd/src/bin/migtd/main.rs
index a44a99e5..c4660aaa 100644
--- a/src/migtd/src/bin/migtd/main.rs
+++ b/src/migtd/src/bin/migtd/main.rs
@@ -455,8 +455,6 @@ fn handle_pre_mig() {
     loop {
         // Poll the async runtime to execute tasks
         let _ = async_runtime::poll_tasks();
-        let mut data: Vec<u8> = Vec::new();
-
         // The async task waiting for VMM response is always in the queue
         let new_request = PENDING_REQUEST.lock().take();
 
@@ -481,6 +479,7 @@ fn handle_pre_mig() {
                 }
                 #[cfg(feature = "vmcall-raw")]
                 {
+                    let mut data: Vec<u8> = Vec::new();
                     match request {
                         WaitForRequestResponse::StartMigration(wfr_info) => {
                             log::trace!(migration_request_id = wfr_info.mig_info.mig_request_id; "Processing StartMigration request\n");
diff --git a/src/migtd/src/migration/servtd_ext.rs b/src/migtd/src/migration/servtd_ext.rs
index 0f4780b5..b7c3ead7 100644
--- a/src/migtd/src/migration/servtd_ext.rs
+++ b/src/migtd/src/migration/servtd_ext.rs
@@ -183,6 +183,7 @@ pub fn write_approved_servtd_ext_hash(servtd_ext_hash: &[u8]) -> Result<(), Migr
     Ok(())
 }
 
+#[cfg(test)]
 mod test {
     use super::ServtdExt;
 
diff --git a/src/migtd/src/migration/session.rs b/src/migtd/src/migration/session.rs
index 0a672e31..c7629f73 100644
--- a/src/migtd/src/migration/session.rs
+++ b/src/migtd/src/migration/session.rs
@@ -295,6 +295,7 @@ fn reject_request(
 }
 
 /// Log an error with an optional `migration_request_id` structured field.
+#[cfg(feature = "vmcall-raw")]
 macro_rules! log_request_error {
     ($request_id:expr, $($arg:tt)*) => {
         if let Some(mig_request_id) = $request_id {
@@ -1032,6 +1033,7 @@ pub async fn exchange_msk(info: &MigrationInformation) -> Result<()> {
         })?;
     }
 
+    #[allow(unused_mut)]
     let mut transport = setup_transport(
         info.mig_info.mig_request_id,
         #[cfg(any(feature = "vmcall-vsock", feature = "virtio-vsock"))]
diff --git a/src/migtd/src/migration/transport.rs b/src/migtd/src/migration/transport.rs
index 35f689db..0615ed5c 100644
--- a/src/migtd/src/migration/transport.rs
+++ b/src/migtd/src/migration/transport.rs
@@ -16,21 +16,21 @@ pub(super) type TransportType = virtio_serial::VirtioSerialPort;
 pub(super) type TransportType = vsock::stream::VsockStream;
 
 pub(super) async fn setup_transport(
-    mig_request_id: u64,
+    _mig_request_id: u64,
     #[cfg(any(feature = "vmcall-vsock", feature = "virtio-vsock"))] migtd_cid: u64,
     #[cfg(any(feature = "vmcall-vsock", feature = "virtio-vsock"))] mig_channel_port: u32,
 ) -> Result<TransportType> {
     #[cfg(feature = "vmcall-raw")]
     {
         use vmcall_raw::stream::VmcallRaw;
-        let mut vmcall_raw_instance = VmcallRaw::new_with_mid(mig_request_id).map_err(|e| {
-            log::error!(migration_request_id = mig_request_id;
+        let mut vmcall_raw_instance = VmcallRaw::new_with_mid(_mig_request_id).map_err(|e| {
+            log::error!(migration_request_id = _mig_request_id;
                     "exchange_msk: Failed to create vmcall_raw_instance errorcode: {:?}\n", e);
             MigrationResult::InvalidParameter
         })?;
 
         vmcall_raw_instance.connect().await.map_err(|e| {
-            log::error!(migration_request_id = mig_request_id;
+            log::error!(migration_request_id = _mig_request_id;
                     "exchange_msk: Failed to connect vmcall_raw_instance errorcode: {:?}\n", e);
             MigrationResult::InvalidParameter
         })?;
@@ -55,7 +55,7 @@ pub(super) async fn setup_transport(
         let mut vsock = VsockStream::new()?;
 
         #[cfg(feature = "vmcall-vsock")]
-        let mut vsock = VsockStream::new_with_cid(migtd_cid, mig_request_id)?;
+        let mut vsock = VsockStream::new_with_cid(migtd_cid, _mig_request_id)?;
 
         // Establish the vsock connection with host
         vsock
@@ -67,11 +67,11 @@ pub(super) async fn setup_transport(
 
 pub(super) async fn shutdown_transport(
     transport: &mut TransportType,
-    mig_request_id: u64,
+    _mig_request_id: u64,
 ) -> Result<()> {
     #[cfg(feature = "vmcall-raw")]
     transport.shutdown().await.map_err(|e| {
-        log::error!(migration_request_id = mig_request_id;
+        log::error!(migration_request_id = _mig_request_id;
             "shutdown_transport: Failed to shutdown vmcall_raw_instance errorcode: {:?}\n", e);
         MigrationResult::InvalidParameter
     })?;