diff --git a/afl/src/events/mod.rs b/afl/src/events/mod.rs
index 68e14df8d9..b76728b75e 100644
--- a/afl/src/events/mod.rs
+++ b/afl/src/events/mod.rs
@@ -941,7 +941,7 @@ where
     let mut mgr;
 
     // We start ourself as child process to actually fuzz
-    if std::env::var(ENV_FUZZER_SENDER).is_err() {
+    if std::env::var(_ENV_FUZZER_SENDER).is_err() {
 
         mgr = LlmpEventManager::<I, SH, ST>::new_on_port(stats, broker_port)?;
         if mgr.is_broker() {
@@ -950,17 +950,17 @@ where
             mgr.broker_loop()?;
         } else {
         
-            mgr.to_env(ENV_FUZZER_BROKER_CLIENT_INITIAL);
+            mgr.to_env(_ENV_FUZZER_BROKER_CLIENT_INITIAL);
 
             // First, create a channel from the fuzzer (sender) to us (receiver) to report its state for restarts.
             let sender = LlmpSender::new(0, false)?;
             let receiver = LlmpReceiver::on_existing_map(
-                AflShmem::clone_ref(&sender.out_maps.last().unwrap().shmem)?,
+                SH::clone_ref(&sender.out_maps.last().unwrap().shmem)?,
                 None,
             )?;
             // Store the information to a map.
-            sender.to_env(ENV_FUZZER_SENDER)?;
-            receiver.to_env(ENV_FUZZER_RECEIVER)?;
+            sender.to_env(_ENV_FUZZER_SENDER)?;
+            receiver.to_env(_ENV_FUZZER_RECEIVER)?;
 
             let mut ctr = 0;
             // Client->parent loop
diff --git a/fuzzers/libfuzzer_libpng/src/mod.rs b/fuzzers/libfuzzer_libpng/src/mod.rs
index 92e2c174e8..1d3e440139 100644
--- a/fuzzers/libfuzzer_libpng/src/mod.rs
+++ b/fuzzers/libfuzzer_libpng/src/mod.rs
@@ -4,12 +4,11 @@
 #[macro_use]
 extern crate clap;
 
-use afl::shmem::AflShmem;
 use clap::{App, Arg};
 use std::{env, path::PathBuf};
 
 use afl::{
-    bolts::tuples::tuple_list,
+    bolts::{tuples::tuple_list, shmem::AflShmem},
     corpus::{Corpus, InMemoryCorpus},
     events::setup_restarting_mgr,
     events::{SimpleStats},