diff --git a/pact_mock_server/src/builder.rs b/pact_mock_server/src/builder.rs
index bc07918d..eff32c1d 100644
--- a/pact_mock_server/src/builder.rs
+++ b/pact_mock_server/src/builder.rs
@@ -1,6 +1,6 @@
 //! Provides a builder for constructing mock servers
 
-use anyhow::anyhow;
+#[allow(unused_imports)] use anyhow::anyhow;
 use pact_models::pact::Pact;
 use pact_models::PactSpecification;
 use pact_models::v4::pact::V4Pact;
diff --git a/pact_mock_server/src/hyper_server.rs b/pact_mock_server/src/hyper_server.rs
index 88d173bc..37f729ec 100644
--- a/pact_mock_server/src/hyper_server.rs
+++ b/pact_mock_server/src/hyper_server.rs
@@ -4,9 +4,9 @@ use std::collections::HashMap;
 use std::fmt;
 use std::fmt::{Display, Formatter};
 use std::net::SocketAddr;
-use std::sync::Arc;
+#[cfg(feature = "tls")] use std::sync::Arc;
 
-use anyhow::anyhow;
+#[allow(unused_imports)] use anyhow::anyhow;
 use bytes::Bytes;
 use http_body_util::{BodyExt, Full};
 use hyper::{Request, Response};
diff --git a/pact_mock_server/src/legacy/mod.rs b/pact_mock_server/src/legacy/mod.rs
index 85e96ce4..1c8a4392 100644
--- a/pact_mock_server/src/legacy/mod.rs
+++ b/pact_mock_server/src/legacy/mod.rs
@@ -1,16 +1,12 @@
 //! Deprecated 1.x mock server functions
 
-use std::path::PathBuf;
-
-use anyhow::anyhow;
-use itertools::{Either, Itertools};
-use pact_models::pact::{load_pact_from_json, Pact, ReadWritePact, write_pact};
-use pact_models::PactSpecification;
+use itertools::Either;
+use pact_models::pact::{load_pact_from_json, Pact};
 #[cfg(feature = "plugins")] use pact_plugin_driver::catalogue_manager;
 #[cfg(feature = "plugins")] use pact_plugin_driver::plugin_manager::get_mock_server_results;
 #[cfg(feature = "tls")] use rustls::ServerConfig;
 use serde_json::json;
-use tracing::{error, info, warn};
+#[allow(unused_imports)] use tracing::{error, info, warn};
 use uuid::Uuid;
 
 use crate::{configure_core_catalogue, MANAGER, MockServerError, WritePactFileErr};
@@ -162,7 +158,7 @@ pub fn start_mock_server_for_transport(
 
   let key = format!("transport/{}", transport);
   let transport_entry = catalogue_manager::lookup_entry(key.as_str())
-    .ok_or_else(|| anyhow!("Transport '{}' is not a known transport", transport))?;
+    .ok_or_else(|| anyhow::anyhow!("Transport '{}' is not a known transport", transport))?;
 
   #[allow(deprecated)]
   MANAGER.lock().unwrap()
@@ -305,9 +301,9 @@ pub fn mock_server_mismatches(mock_server_port: i32) -> Option<String> {
                       "path": mismatch.path,
                       "diff": mismatch.diff.clone().unwrap_or_default()
                     })
-                  }).collect_vec()
+                  }).collect::<Vec<_>>()
                 })
-              }).collect_vec())
+              }).collect::<Vec<_>>())
               },
               Err(err) => {
                 error!("Request to plugin to get matching results failed - {}", err);
@@ -356,18 +352,18 @@ pub fn write_pact_file(
           {
             let mut pact = _plugin_mock_server.pact.clone();
             pact.add_md_version("mockserver", option_env!("CARGO_PKG_VERSION").unwrap_or("unknown"));
-            let pact_file_name = pact.default_file_name();
+            let pact_file_name = pact_models::pact::ReadWritePact::default_file_name(&pact);
             let filename = match directory {
               Some(ref path) => {
-                let mut path = PathBuf::from(path);
+                let mut path = std::path::PathBuf::from(path);
                 path.push(pact_file_name);
                 path
               },
-              None => PathBuf::from(pact_file_name)
+              None => std::path::PathBuf::from(pact_file_name)
             };
 
             info!("Writing pact out to '{}'", filename.display());
-            match write_pact(pact.boxed(), filename.as_path(), PactSpecification::V4, overwrite) {
+            match pact_models::pact::write_pact(pact.boxed(), filename.as_path(), pact_models::PactSpecification::V4, overwrite) {
               Ok(_) => Ok(()),
               Err(err) => {
                 warn!("Failed to write pact to file - {}", err);
diff --git a/pact_mock_server/src/mock_server.rs b/pact_mock_server/src/mock_server.rs
index 6b2d5a1f..5e3ffcef 100644
--- a/pact_mock_server/src/mock_server.rs
+++ b/pact_mock_server/src/mock_server.rs
@@ -73,7 +73,7 @@ impl MockServerConfig {
 // Need to implement this, as we can't compare TLS configuration.
 impl PartialEq for MockServerConfig {
   fn eq(&self, other: &Self) -> bool {
-    let mut ok = self.cors_preflight == other.cors_preflight
+    let ok = self.cors_preflight == other.cors_preflight
       && self.pact_specification == other.pact_specification
       && self.transport_config == other.transport_config
       && self.address == other.address
@@ -81,10 +81,13 @@ impl PartialEq for MockServerConfig {
 
     #[cfg(feature = "plugins")]
     {
-      ok = ok && self.transport_entry == other.transport_entry;
+      ok && self.transport_entry == other.transport_entry
     }
 
-    ok
+    #[cfg(not(feature = "plugins"))]
+    {
+      ok
+    }
   }
 }
 
diff --git a/pact_mock_server/src/server_manager.rs b/pact_mock_server/src/server_manager.rs
index e97bc832..8232343c 100644
--- a/pact_mock_server/src/server_manager.rs
+++ b/pact_mock_server/src/server_manager.rs
@@ -257,6 +257,7 @@ impl ServerManager {
     }
     #[cfg(not(feature = "plugins"))]
     {
+      #[allow(unused_imports)]
       self.start_mock_server_with_addr(id, pact, addr, config)
         .map_err(|err| anyhow!(err))
     }