diff --git a/pkgs/clan-app/shell.nix b/pkgs/clan-app/shell.nix
index b490fd49e..b9ecfd194 100644
--- a/pkgs/clan-app/shell.nix
+++ b/pkgs/clan-app/shell.nix
@@ -19,11 +19,11 @@ mkShell {
       ps:
       with ps;
       [
-        ruff
         mypy
       ]
       ++ (clan-app.devshellPyDeps ps)
     ))
+    ruff
   ] ++ clan-app.runtimeDeps;
 
   shellHook = ''
diff --git a/pkgs/clan-cli/clan_cli/nix/__init__.py b/pkgs/clan-cli/clan_cli/nix/__init__.py
index 58bbee025..9a54f960c 100644
--- a/pkgs/clan-cli/clan_cli/nix/__init__.py
+++ b/pkgs/clan-cli/clan_cli/nix/__init__.py
@@ -113,8 +113,8 @@ def nix_shell(packages: list[str], cmd: list[str]) -> list[str]:
 
 # lazy loads list of allowed and static programs
 class Programs:
-    allowed_programs = None
-    static_programs = None
+    allowed_programs: list[str] | None = None
+    static_programs: list[str] | None = None
 
     @classmethod
     def is_allowed(cls: type["Programs"], program: str) -> bool:
diff --git a/pkgs/clan-cli/clan_cli/vars/prompt.py b/pkgs/clan-cli/clan_cli/vars/prompt.py
index 5fc174170..6f6c5e726 100644
--- a/pkgs/clan-cli/clan_cli/vars/prompt.py
+++ b/pkgs/clan-cli/clan_cli/vars/prompt.py
@@ -8,7 +8,7 @@ from typing import Any
 log = logging.getLogger(__name__)
 
 # This is for simulating user input in tests.
-MOCK_PROMPT_RESPONSE = None
+MOCK_PROMPT_RESPONSE: None = None
 
 
 class PromptType(enum.Enum):
diff --git a/pkgs/clan-cli/shell.nix b/pkgs/clan-cli/shell.nix
index 1d4a8f17c..384b88d1a 100644
--- a/pkgs/clan-cli/shell.nix
+++ b/pkgs/clan-cli/shell.nix
@@ -14,11 +14,11 @@ mkShell {
       ps:
       with ps;
       [
-        ruff
         mypy
       ]
       ++ (clan-cli.devshellPyDeps ps)
     ))
+    ruff
     nix-unit
   ] ++ clan-cli.runtimeDependencies;
 
@@ -33,6 +33,8 @@ mkShell {
     export PKG_ROOT="$GIT_ROOT/pkgs/clan-cli"
     export PYTHONWARNINGS=error
 
+    export CLAN_CORE_PATH="$GIT_ROOT"
+
     # Add current package to PYTHONPATH
     export PYTHONPATH="$PKG_ROOT''${PYTHONPATH:+:$PYTHONPATH:}"