diff --git a/Makefile b/Makefile
index 8b29356..2fba2f0 100644
--- a/Makefile
+++ b/Makefile
@@ -26,14 +26,27 @@ documentation:
 tmp:
 	mkdir -p tmp
 
-dockerfiles:
+.dockerfiles:
 	mkdir -p dockerfiles/build
-	cat dockerfiles/src/debian_bookworm > dockerfiles/build/Dockerfile.debian_bookworm
-	cat dockerfiles/src/shared >> dockerfiles/build/Dockerfile.debian_bookworm
+	cat dockerfiles/src/wine > dockerfiles/build/Dockerfile.wine
+	cat dockerfiles/src/debian_trixie > dockerfiles/build/Dockerfile.debian_trixie
+	cat dockerfiles/src/shared >> dockerfiles/build/Dockerfile.debian_trixie
+	cat dockerfiles/src/fedora_40 > dockerfiles/build/Dockerfile.fedora_40
+	cat dockerfiles/src/shared >> dockerfiles/build/Dockerfile.fedora_40
 
-test-in-docker: dockerfiles
-	docker build . -f dockerfiles/Dockerfile.debian_bookworm --name pffi-test-debian-bookworm
-	docker run -v ${PWD}:/workdir pffi-test-debian-bookworm
+test-in-docker-wine: .dockerfiles
+	docker build . -f dockerfiles/build/Dockerfile.wine --tag pffi-test-wine
+	docker run -v ${PWD}:/workdir:z pffi-test-wine
+
+test-in-docker-debian-trixie: .dockerfiles
+	docker build . -f dockerfiles/build/Dockerfile.debian_trixie --tag pffi-test-debian-trixie
+	docker run -v ${PWD}:/workdir:z pffi-test-debian-trixi2
+
+test-in-docker-fedora-40: .dockerfiles
+	docker build . -f dockerfiles/build/Dockerfile.fedora_40 --tag pffi-test-fedora-40
+	docker run -v ${PWD}:/workdir:z pffi-test-fedora-40
+
+test-in-docker: test-in-docker-debian-trixie test-in-docker-fedora-40
 	
 
 test: build
@@ -61,3 +74,4 @@ clean:
 	rm -rf *.a
 	rm -rf tmp
 	find ./test -type f -not -name "*.scm" -exec bash -c "test -x {} && rm {}" \;
+	rm -rf dockerfiles/build
diff --git a/dockerfiles/Dockerfile.debian_bookworm b/dockerfiles/Dockerfile.debian_bookworm
deleted file mode 100644
index 5fca745..0000000
--- a/dockerfiles/Dockerfile.debian_bookworm
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM debian:bookworm
-RUN apt-get update && apt-get install -y build-essential git wget make cmake libgc-dev zlib1g-dev libffi-dev
diff --git a/dockerfiles/src/debian_bookworm b/dockerfiles/src/debian_bookworm
deleted file mode 100644
index 8ee1af6..0000000
--- a/dockerfiles/src/debian_bookworm
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM debian:bookworm
-RUN apt-get update && apt-get install -y build-essential bash git wget make cmake libgc-dev zlib1g-dev libffi-dev
diff --git a/dockerfiles/src/debian_trixie b/dockerfiles/src/debian_trixie
new file mode 100644
index 0000000..9bab839
--- /dev/null
+++ b/dockerfiles/src/debian_trixie
@@ -0,0 +1,3 @@
+FROM debian:bookworm
+RUN apt-get update && apt-get install -y build-essential bash git wget make cmake libgc-dev zlib1g-dev libffi-dev libssl-dev guile-3.0 chicken-bin racket
+
diff --git a/dockerfiles/src/fedora_40 b/dockerfiles/src/fedora_40
new file mode 100644
index 0000000..09a0775
--- /dev/null
+++ b/dockerfiles/src/fedora_40
@@ -0,0 +1,3 @@
+FROM fedora:40
+RUN dnf group install "Development Tools" -y && dnf install -y openssl-devel guile30 chicken racket-minimal
+RUN ln -s /usr/bin/guile3.0 /usr/bin/guile
diff --git a/dockerfiles/src/shared b/dockerfiles/src/shared
index dc7100f..66cceb3 100644
--- a/dockerfiles/src/shared
+++ b/dockerfiles/src/shared
@@ -1,4 +1,4 @@
 RUN mkdir -p /workdir
-RUN wget https://bitbucket.org/ktakashi/sagittarius-scheme/downloads/sagittarius-0.9.11.tar.gz
+#RUN wget https://bitbucket.org/ktakashi/sagittarius-scheme/downloads/sagittarius-0.9.11.tar.gz && tar -xf sagittarius-0.9.11.tar.gz && cd sagittarius-0.9.11 && cmake . && make && make install
 WORKDIR /workdir
-ENTRYPOINT ["bash", "test-all.sh"]
+ENTRYPOINT ["bash", "test-guile.sh"]
diff --git a/dockerfiles/src/wine b/dockerfiles/src/wine
new file mode 100644
index 0000000..43a967f
--- /dev/null
+++ b/dockerfiles/src/wine
@@ -0,0 +1,4 @@
+FROM debian:trixie
+RUN dpkg --add-architecture i386 && dpkg --add-architecture amd64 && dpkg --add-architecture aarch64
+RUN apt-get update && apt-get install -y wine64:amd64
+RUN wget 
diff --git a/retropikzel/pffi/v0-3-0/main.scm b/retropikzel/pffi/v0-3-0/main.scm
index 8f0aca2..e5fcd0f 100644
--- a/retropikzel/pffi/v0-3-0/main.scm
+++ b/retropikzel/pffi/v0-3-0/main.scm
@@ -156,11 +156,13 @@
               (if (get-environment-variable "SystemRoot")
                 (list (string-append
                         (get-environment-variable "SystemRoot")
+                        slash
                         "system32"))
                 (list))
-              (list "."
-                    )
-              (string-split (get-environment-variable "PATH") #\;)))
+              (list ".")
+              (if (get-environment-variable "PATH")
+                (string-split (get-environment-variable "PATH") #\;)
+                (list))))
           (else
             (append
               ; Guix