diff --git a/Dockerfile b/Dockerfile
index 42b3b3d..26cbe93 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,11 +30,10 @@ RUN apt-get update -qq && \
 # Fetch and compile squashfs-tools
 RUN git clone https://github.com/plougher/squashfs-tools.git
 RUN cd squashfs-tools && \
-	git checkout 4.5.1 && \
+	git checkout 4.6.1 && \
 	sed -Ei 's/#(XZ_SUPPORT.*)/\1/' squashfs-tools/Makefile && \
 	sed -Ei 's/#(LZO_SUPPORT.*)/\1/' squashfs-tools/Makefile && \
 	sed -Ei 's/#(LZ4_SUPPORT.*)/\1/' squashfs-tools/Makefile && \
-	sed -Ei 's|(INSTALL_PREFIX = ).*|\1 /usr|' squashfs-tools/Makefile && \
 	sed -Ei 's/\$\(INSTALL_DIR\)/$(DESTDIR)$(INSTALL_DIR)/g' squashfs-tools/Makefile && \
 	cd squashfs-tools && \
 	make -j$(nproc) && \
@@ -46,8 +45,8 @@ RUN snap download snapd
 RUN unsquashfs -f -d /snap/snapd/current snapd_*.snap
 
 # Replace mksquashfs and unsqusahfs with our own
-RUN cp /usr/bin/mksquashfs /snap/snapd/current/usr/bin
-RUN cp /usr/bin/unsquashfs /snap/snapd/current/usr/bin
+RUN cp /usr/local/bin/mksquashfs /snap/snapd/current/usr/bin
+RUN cp /usr/local/bin/unsquashfs /snap/snapd/current/usr/bin
 
 # Repack snapd
 RUN mksquashfs /snap/snapd/current /snapd.snap
diff --git a/entrypoint.sh b/entrypoint.sh
index ec4ef74..22f92eb 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -113,5 +113,6 @@ if grep -q securityfs /proc/filesystems; then
     mount -o rw,nosuid,nodev,noexec,relatime securityfs -t securityfs /sys/kernel/security
 fi
 mount -t tmpfs tmpfs /run
+mkdir -p /run/lock
 mount -t tmpfs tmpfs /run/lock
 exec /lib/systemd/systemd --system --system-unit docker-exec.service