diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 27725f2..d92b6b0 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -17,10 +17,10 @@ jobs:
     - uses: ilammy/msvc-dev-cmd@v1
     - name: install cxxbridge
       run: cargo install cxxbridge-cmd
-    - name: install cargo-make
-      run: cargo install cargo-make
+    - name: install just
+      run: cargo install just
     - name: Compile test
-      run: cargo make build_test
+      run: just build_test
     - name: Build
       run: cargo build --verbose
     - name: Run tests
@@ -31,10 +31,10 @@ jobs:
     - uses: actions/checkout@v3
     - name: install cxxbridge
       run: cargo install cxxbridge-cmd
-    - name: install cargo-make
-      run: cargo install cargo-make
+    - name: install just
+      run: cargo install just
     - name: Compile test
-      run: cargo make build_test
+      run: just build_test
     - name: Build
       run: cargo build --verbose
     # - name: Run tests
@@ -45,10 +45,10 @@ jobs:
     - uses: actions/checkout@v3
     - name: install cxxbridge
       run: cargo install cxxbridge-cmd
-    - name: install cargo-make
-      run: cargo install cargo-make
+    - name: install just
+      run: cargo install just
     - name: Compile test
-      run: cargo make build_test
+      run: just build_test
     - name: Build
       run: cargo build --verbose
     - name: Run tests
diff --git a/Justfile b/Justfile
new file mode 100644
index 0000000..d8a3b16
--- /dev/null
+++ b/Justfile
@@ -0,0 +1,5 @@
+build_configure:
+    cmake -S ./test -B ./test/build -DCMAKE_BUILD_TYPE=Debug
+
+build_test: build_configure
+    cmake --build ./test/build --config Debug
diff --git a/Makefile.toml b/Makefile.toml
deleted file mode 100644
index fa759d1..0000000
--- a/Makefile.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[tasks.build_test]
-dependencies = ["build_configure"]
-cwd = "./test"
-command = "cmake"
-args = ["--build", "build", "--config", "Debug"]
-
-[tasks.build_configure]
-cwd = "./test"
-command = "cmake"
-args = ["-S", ".", "-B", "build"]
diff --git a/build.rs b/build.rs
index 0fe0a5a..a651af3 100644
--- a/build.rs
+++ b/build.rs
@@ -152,7 +152,10 @@ fn main() {
     println!("cargo:rustc-link-lib=static=reil");
 
     #[cfg(target_os = "windows")]
-    println!("cargo:rustc-link-lib=dylib=dbghelp");
+    {
+        println!("cargo:rustc-link-lib=dylib=dbghelp");
+        println!("cargo:rustc-link-lib=dylib=advapi32");
+    }
 
     println!("cargo:rerun-if-changed=src/");
     println!("cargo:rerun-if-changed=src/tinyinst.rs");