diff --git a/metrics/src/metrics.rs b/metrics/src/metrics.rs
index 44a69ab51..1ce35c2ce 100644
--- a/metrics/src/metrics.rs
+++ b/metrics/src/metrics.rs
@@ -406,7 +406,7 @@ fn get_metrics_config() -> Result<MetricsConfig, String> {
 }
 
 pub fn query(q: &str) -> Result<String, String> {
-    let config = get_metrics_config().map_err(|err| err)?;
+    let config = get_metrics_config()?;
     let query_url = format!(
         "{}/query?u={}&p={}&q={}",
         &config.host, &config.username, &config.password, &q
diff --git a/net-utils/src/ip_echo_server.rs b/net-utils/src/ip_echo_server.rs
index 31f0b704d..333561d4d 100644
--- a/net-utils/src/ip_echo_server.rs
+++ b/net-utils/src/ip_echo_server.rs
@@ -64,10 +64,12 @@ async fn process_connection(
     info!("connection from {:?}", peer_addr);
 
     let mut data = vec![0u8; ip_echo_server_request_length()];
-    let (mut reader, mut writer) = socket.split();
 
-    let _ = timeout(IO_TIMEOUT, reader.read_exact(&mut data)).await??;
-    drop(reader);
+    let mut writer = {
+        let (mut reader, writer) = socket.split();
+        let _ = timeout(IO_TIMEOUT, reader.read_exact(&mut data)).await??;
+        writer
+    };
 
     let request_header: String = data[0..HEADER_LENGTH].iter().map(|b| *b as char).collect();
     if request_header != "\0\0\0\0" {
diff --git a/sdk/program/src/sysvar/mod.rs b/sdk/program/src/sysvar/mod.rs
index 6cf1a3a64..8b631e194 100644
--- a/sdk/program/src/sysvar/mod.rs
+++ b/sdk/program/src/sysvar/mod.rs
@@ -137,10 +137,10 @@ macro_rules! impl_sysvar_get {
                 $syscall_name(var_addr)
             };
             #[cfg(not(target_arch = "bpf"))]
-            let result = crate::program_stubs::$syscall_name(var_addr);
+            let result = $crate::program_stubs::$syscall_name(var_addr);
 
             match result {
-                crate::entrypoint::SUCCESS => Ok(var),
+                $crate::entrypoint::SUCCESS => Ok(var),
                 e => Err(e.into()),
             }
         }