diff --git a/examples/PoolBox/PoolBox.code-workspace b/examples/PoolBox/PoolBox.code-workspace
index cbe22001..ce1c336c 100644
--- a/examples/PoolBox/PoolBox.code-workspace
+++ b/examples/PoolBox/PoolBox.code-workspace
@@ -11,7 +11,7 @@
 			{ 
 				"label": "build",
 				"type": "shell", // TODO: Sort out JABY_ENGINE_DIR!!! Can it be set in the docker image? Can it just be JABY_ENGINE_PATH?
-				"command": "${env:JABY_ENGINE_PATH}/scripts/podman_jaby_engine.sh ${workspaceFolder} . make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} REGION=${input:region} CUSTOM_CONFIG=${input:custom config} JABY_ENGINE_DIR=/jaby_engine",
+				"command": "${env:JABY_ENGINE_PATH}/scripts/podman_jaby_engine.sh ${workspaceFolder} . make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} REGION=${input:region} CUSTOM_CONFIG=${input:custom config}",
 				"group": {
 					"kind": "build",
 					"isDefault": true
diff --git a/podman/Dockerfile b/podman/Dockerfile
index 0f287910..47fb9687 100644
--- a/podman/Dockerfile
+++ b/podman/Dockerfile
@@ -13,6 +13,7 @@ ADD ["scripts/install_pop-fe.sh", "/usr/scripts"]
 
 ENV PATH="/jaby_engine/bin:/root/.cargo/bin:${PATH}"
 ENV JABY_ENGINE_PATH=/jaby_engine
+ENV JABY_ENGINE_DIR=/jaby_engine
 ENV PSX_LICENSE_PATH=/psx_license
 
 #WORKDIR /usr/src/project
diff --git a/podman/scripts/install_rust.sh b/podman/scripts/install_rust.sh
index 0c4136c6..6a30f7c0 100755
--- a/podman/scripts/install_rust.sh
+++ b/podman/scripts/install_rust.sh
@@ -2,6 +2,7 @@
 echo "<<< Install Rust prerequisites >>>"
 apt install -y curl
 
+# TODO: Specific version??
 echo "<<< Install Rust >>>"
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 . "$HOME/.cargo/env"
diff --git a/support/src/FontWriter/Makefile b/support/src/FontWriter/Makefile
index 75d9db76..a9921bf2 100644
--- a/support/src/FontWriter/Makefile
+++ b/support/src/FontWriter/Makefile
@@ -1,4 +1,3 @@
-JABY_ENGINE_DIR = /jaby_engine
 include $(JABY_ENGINE_DIR)/mkfile/common/RebuildTarget.mk
 
 ARTIFACT  = libFontWriter