diff --git a/client/build.rs b/client/build.rs
index a516561..28bc499 100644
--- a/client/build.rs
+++ b/client/build.rs
@@ -6,10 +6,10 @@ use std::{env, fs};
 
 const BENCHMARKS: &[&str] = &[
     "src/ud/libud.c",
-    // "src/wikisort/libwikisort.c", Error: undefined reference to rand_beebs
+    "src/wikisort/libwikisort.c",
     "src/nbody/nbody.c",
     "src/edn/libedn.c",
-    "src/st/libst.c",
+    // "src/st/libst.c", Collides with matmult-int
     "src/aha-mont64/mont64.c",
     "src/matmult-int/matmult-int.c",
     "src/slre/libslre.c",
@@ -20,7 +20,7 @@ const BENCHMARKS: &[&str] = &[
     "src/minver/libminver.c",
     "src/statemate/libstatemate.c",
     "src/crc32/crc_32.c",
-    "src/picojpeg/libpicojpeg.c",
+    // "src/picojpeg/libpicojpeg.c", Contains multiple source fails, maybe a todo if relevant
     "src/cubic/basicmath_small.c",
     "src/md5sum/md5.c",
     "src/qrduino/qrtest.c",
@@ -49,13 +49,13 @@ fn main() {
         let path = embench_dir.join(benchmark_file);
         let dir = path.parent().unwrap();
         let benchmark_name = dir.file_name().unwrap().to_string_lossy().replace("-", "_");
-        println!("cargo:warning={path:?}");
 
         let mut build = cc::Build::new();
         build
             .include(embench_dir.join("support"))
             .file(embench_dir.join("support/beebsc.c"))
             .file(&path)
+            .warnings(false)
             // Just use some roughly accurate value, it just influences how long each benchmark runs
             .define("CPU_MHZ", "2700");
 
diff --git a/client/src/bin/client_picojpeg.rs b/client/src/bin/client_picojpeg.rs
deleted file mode 100644
index 0825504..0000000
--- a/client/src/bin/client_picojpeg.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-use client::program;
-
-fn main() {
-    program::<client::embench_sys::picojpeg>();
-}
diff --git a/client/src/bin/client_st.rs b/client/src/bin/client_st.rs
deleted file mode 100644
index c100977..0000000
--- a/client/src/bin/client_st.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-use client::program;
-
-fn main() {
-    program::<client::embench_sys::st>();
-}
diff --git a/client/src/bin/client_wikisort.rs b/client/src/bin/client_wikisort.rs
new file mode 100644
index 0000000..2504f05
--- /dev/null
+++ b/client/src/bin/client_wikisort.rs
@@ -0,0 +1,5 @@
+use client::program;
+
+fn main() {
+    program::<client::embench_sys::wikisort>();
+}