diff --git a/dockerfiles/Dockerfile.snow-chibi-install-test b/dockerfiles/Dockerfile.snow-chibi-install-test
index 0492b61..384ea27 100644
--- a/dockerfiles/Dockerfile.snow-chibi-install-test
+++ b/dockerfiles/Dockerfile.snow-chibi-install-test
@@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y \
 RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
 RUN cd chibi-scheme && make -j 32
 RUN git clone https://gitea.scheme.org/Retropikzel/compile-r7rs.git --depth=1
-RUN cd compile-r7rs --branch=retropikzel-dependency-fixes && make
+RUN cd compile-r7rs && make
 
 ARG SCHEME=chibi
 ARG IMAGE=chibi:head
diff --git a/dockerfiles/Dockerfile.test b/dockerfiles/Dockerfile.test
index a273cf6..a855c54 100644
--- a/dockerfiles/Dockerfile.test
+++ b/dockerfiles/Dockerfile.test
@@ -15,12 +15,12 @@ ARG SCHEME=chibi
 ARG IMAGE=chibi:head
 FROM schemers/${IMAGE}
 RUN apt-get update && apt-get install -y \
-	build-essential \
-	git \
-	ca-certificates \
-	make \
-    	libffi-dev
-RUN mkdir ${HOME}/.snow && echo "()" > ${HOME}/.snow/config.scm
+    build-essential \
+    git \
+    ca-certificates \
+    make \
+        libffi-dev
+RUN mkdir -p ${HOME}/.snow && echo "()" > ${HOME}/.snow/config.scm
 COPY --from=build /chibi-scheme /chibi-scheme
 RUN cd /chibi-scheme && make -j 8 install
 COPY --from=build /compile-r7rs /compile-r7rs
diff --git a/foreign/c.sld b/foreign/c.sld
index 77520b8..28ba5ad 100644
--- a/foreign/c.sld
+++ b/foreign/c.sld
@@ -317,18 +317,15 @@
     ;(tr7 (include "c/primitives/tr7.scm"))
     (ypsilon (export c-function c-callback)
              (include "c/primitives/ypsilon.scm")))
-  (cond-expand
-    (chicken (include-relative "c/main.scm")
-             (include-relative "c/libc.scm")
-             (include-relative "c/c-bytevectors.scm")
-             (include-relative "c/pointer.scm")
-             ;(include-relative "c/array.scm")
-             ;(include-relative "c/struct.scm")
-               )
-    (else (include "c/main.scm")
-          (include "c/libc.scm")
-          (include "c/c-bytevectors.scm")
-          (include "c/pointer.scm")
-          ;(include "c/array.scm")
-          ;(include "c/struct.scm")
-          )))
+    (cond-expand
+      (chicken (include-relative "c/main.scm")
+               (include-relative "c/libc.scm")
+               (include-relative "c/c-bytevectors.scm")
+               (include-relative "c/pointer.scm"))
+      (else (include "c/main.scm")
+            (include "c/libc.scm")
+            (include "c/c-bytevectors.scm")
+            (include "c/pointer.scm")))
+    ;(include "c/array.scm")
+    ;(include "c/struct.scm")
+          )