diff --git a/bin/__dispatch.sh b/bin/__dispatch.sh
index d502a9dfa..ffb4605fd 100755
--- a/bin/__dispatch.sh
+++ b/bin/__dispatch.sh
@@ -6,7 +6,7 @@
 # to the key in nixpkgs which represents the program you want to run.
 set -ueo pipefail
 
-readonly REPO_ROOT=$(dirname $0)/../..
+readonly REPO_ROOT=$(dirname $0)/..
 TARGET_TOOL=$(basename $0)
 
 case "${TARGET_TOOL}" in
diff --git a/default.nix b/default.nix
index 34fd8dea2..f638b8f2b 100644
--- a/default.nix
+++ b/default.nix
@@ -29,7 +29,7 @@ let
   readTree' = import ./read-tree.nix;
 
   localPkgs = readTree: {
-    fun         = readTree ./ops;
+    fun         = readTree ./fun;
     nix         = readTree ./nix;
     ops         = readTree ./ops;
     third_party = readTree ./third_party;
diff --git a/read-tree.nix b/read-tree.nix
index 82d5f040b..052865914 100644
--- a/read-tree.nix
+++ b/read-tree.nix
@@ -56,6 +56,6 @@ let
         value = importWithMark p (parts ++ [ c ]);
       }) nixFiles;
     in if dir ? "default.nix"
-      then self // (listToAttrs children)
+      then (if isAttrs self then self // (listToAttrs children) else self)
       else listToAttrs (nixChildren ++ children);
 in readTree initPath [ (baseNameOf initPath) ]