diff --git a/src/config.rs b/src/config.rs
index 0c8a5d7..f508889 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -208,13 +208,9 @@ impl Server {
     ///
     /// This does not check whether it exists.
     pub fn server_directory(config: &Config) -> Option<PathBuf> {
-        if config.server.directory.is_none() {
-            return None;
-        }
-
         // Get directory, relative to config directory if known
         match config.path.as_ref().and_then(|p| p.parent()) {
-            Some(config_dir) => Some(config_dir.join(config.server.directory.as_ref().unwrap())),
+            Some(config_dir) => Some(config_dir.join(config.server.directory.as_ref()?)),
             None => config.server.directory.clone(),
         }
     }
diff --git a/src/server.rs b/src/server.rs
index c3ba6d0..9a5d643 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -508,7 +508,7 @@ async fn stop_server_rcon(config: &Config, server: &Server) -> bool {
     }
 
     // Create RCON client
-    let mut rcon = match Rcon::connect_config(&config).await {
+    let mut rcon = match Rcon::connect_config(config).await {
         Ok(rcon) => rcon,
         Err(err) => {
             error!(target: "lazymc", "Failed to RCON server to sleep: {}", err);
diff --git a/src/status.rs b/src/status.rs
index 689c4ed..ed96be5 100644
--- a/src/status.rs
+++ b/src/status.rs
@@ -238,7 +238,7 @@ async fn server_status(client_info: &ClientInfo, config: &Config, server: &Serve
             favicon = status.as_ref().unwrap().favicon.clone()
         }
         if favicon.is_none() {
-            favicon = Some(server_favicon(&config).await);
+            favicon = Some(server_favicon(config).await);
         }
     }