diff --git a/.gitignore b/.gitignore
index 3727f15757..475c38a9e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,5 @@ perf.data.old
 test.dict
 
 # Ignore all built fuzzers
-fuzzer_*
\ No newline at end of file
+fuzzer_*
+AFLplusplus
diff --git a/fuzzers/frida_libpng/src/fuzzer.rs b/fuzzers/frida_libpng/src/fuzzer.rs
index e35436cde3..541a5c7e59 100644
--- a/fuzzers/frida_libpng/src/fuzzer.rs
+++ b/fuzzers/frida_libpng/src/fuzzer.rs
@@ -16,8 +16,8 @@ use libafl::{
         tuples::{tuple_list, Merge},
     },
     corpus::{
-        ondisk::OnDiskMetadataFormat, Corpus, InMemoryCorpus,
-        IndexesLenTimeMinimizerCorpusScheduler, OnDiskCorpus, QueueCorpusScheduler,
+        ondisk::OnDiskMetadataFormat, Corpus, IndexesLenTimeMinimizerCorpusScheduler, OnDiskCorpus,
+        QueueCorpusScheduler,
     },
     executors::{
         inprocess::InProcessExecutor, timeout::TimeoutExecutor, Executor, ExitKind, HasExecHooks,
@@ -384,7 +384,6 @@ unsafe fn fuzz(
                 StdRand::with_seed(current_nanos()),
                 // Corpus that will be evolved, we keep it in memory for performance
                 OnDiskCorpus::new(PathBuf::from("./corpus_discovered")).unwrap(),
-                //InMemoryCorpus::new(),
                 // Corpus in which we store solutions (crashes in this example),
                 // on disk so the user can get them after stopping the fuzzer
                 OnDiskCorpus::new_save_meta(
diff --git a/libafl_frida/src/asan_errors.rs b/libafl_frida/src/asan_errors.rs
index 81f0ce5d4e..348decc925 100644
--- a/libafl_frida/src/asan_errors.rs
+++ b/libafl_frida/src/asan_errors.rs
@@ -1,6 +1,7 @@
 use backtrace::Backtrace;
 use capstone::{arch::BuildsCapstone, Capstone};
 use color_backtrace::{default_output_stream, BacktracePrinter, Verbosity};
+#[cfg(target_arch = "aarch64")]
 use frida_gum::interceptor::Interceptor;
 use libafl::{
     bolts::{os::find_mapping_for_address, ownedref::OwnedPtr, tuples::Named},
@@ -256,10 +257,10 @@ impl AsanErrors {
                     name, address, size
                 )
                 .unwrap();
-                let invocation = Interceptor::current_invocation();
-                let cpu_context = invocation.cpu_context();
                 #[cfg(target_arch = "aarch64")]
                 {
+                    let invocation = Interceptor::current_invocation();
+                    let cpu_context = invocation.cpu_context();
                     #[allow(clippy::non_ascii_literal)]
                     writeln!(output, "{:━^100}", " REGISTERS ").unwrap();
                     for reg in 0..29 {
diff --git a/scripts/build_all_fuzzers.sh b/scripts/build_all_fuzzers.sh
index b070178f53..6c6586d176 100755
--- a/scripts/build_all_fuzzers.sh
+++ b/scripts/build_all_fuzzers.sh
@@ -11,6 +11,7 @@ do
     echo "[+] Checking fmt and building $fuzzer"
     cd $fuzzer \
         && cargo fmt --all -- --check \
+	&& cargo clippy \
         && cargo build \
         && cd .. \
     || exit 1