diff --git a/llama_toolchain/agentic_system/__init__.py b/llama_toolchain/agentic_system/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/llama_toolchain/agentic_system/providers.py b/llama_toolchain/agentic_system/providers.py
index 4f8055f16..463c2976e 100644
--- a/llama_toolchain/agentic_system/providers.py
+++ b/llama_toolchain/agentic_system/providers.py
@@ -16,6 +16,7 @@ def available_agentic_system_providers() -> List[ProviderSpec]:
             provider_id="meta-reference",
             pip_packages=[
                 "codeshield",
+                "pillow",
                 "torch",
                 "transformers",
             ],
diff --git a/llama_toolchain/distribution/install_distribution.sh b/llama_toolchain/distribution/install_distribution.sh
index 908360894..60b128e1a 100755
--- a/llama_toolchain/distribution/install_distribution.sh
+++ b/llama_toolchain/distribution/install_distribution.sh
@@ -54,10 +54,14 @@ ensure_conda_env_python310() {
   conda deactivate && conda activate "${env_name}"
 
   # Re-installing llama-toolchain in the new conda environment
-  if git rev-parse --is-inside-work-tree &>/dev/null; then
-    repo_root=$(git rev-parse --show-toplevel)
-    cd "$repo_root"
-    pip install -e .
+  if [ -n "$LLAMA_TOOLCHAIN_DIR" ]; then
+    if [ ! -d "$LLAMA_TOOLCHAIN_DIR" ]; then
+      echo -e "${RED}Warning: LLAMA_TOOLCHAIN_DIR is set but directory does not exist: $LLAMA_TOOLCHAIN_DIR${NC}" >&2
+      exit 1
+    fi
+
+    echo "Installing from LLAMA_TOOLCHAIN_DIR: $LLAMA_TOOLCHAIN_DIR"
+    pip install -e "$LLAMA_TOOLCHAIN_DIR"
   else
     pip install llama-toolchain
   fi
diff --git a/llama_toolchain/inference/ollama/ollama.py b/llama_toolchain/inference/ollama/ollama.py
index 6aef15ab8..4f4a161ad 100644
--- a/llama_toolchain/inference/ollama/ollama.py
+++ b/llama_toolchain/inference/ollama/ollama.py
@@ -66,10 +66,7 @@ class OllamaInference(Inference):
         try:
             await self.client.ps()
         except httpx.ConnectError:
-            print(
-                "Ollama Server is not running, start it using `ollama serve` in a separate terminal"
-            )
-            raise
+            raise RuntimeError("Ollama Server is not running, start it using `ollama serve` in a separate terminal")
 
     async def shutdown(self) -> None:
         pass
diff --git a/llama_toolchain/safety/providers.py b/llama_toolchain/safety/providers.py
index f8e2e0a86..40691e376 100644
--- a/llama_toolchain/safety/providers.py
+++ b/llama_toolchain/safety/providers.py
@@ -15,6 +15,7 @@ def available_safety_providers() -> List[ProviderSpec]:
             api=Api.safety,
             provider_id="meta-reference",
             pip_packages=[
+                "accelerate",
                 "codeshield",
                 "torch",
                 "transformers",