diff --git a/lang/ninja/src/build.sld b/lang/ninja/src/build.sld
index c2fdb26..8f3f31e 100644
--- a/lang/ninja/src/build.sld
+++ b/lang/ninja/src/build.sld
@@ -59,7 +59,7 @@
   (define (make-valid-store-path-string str)
     (if (string=? "" str)
       "zilch-ninja"
-      (string-map (lambda (c) (if (is-valid-store-path-char c) c #\-)) (if (> (string-length str) 211) (string-copy str 0 211) str))))
+      (string-map (lambda (c) (if (is-valid-store-path-char c) c #\-)) (if (> (string-length str) 128) (string-copy str 0 128) str))))
 
   ;; Returns a derivation that runs the command for this edge,
   ;; inside a Nix derivation with the correct inputs.
@@ -219,7 +219,7 @@
     (define outpath
      (cdar
       (store-path-for-ca-drv*
-       (make-valid-store-path-string (build-rule-description resolved))
+       (make-valid-store-path-string (if (string=? (build-rule-description resolved) "") (build-rule-command resolved) (build-rule-description resolved)))
        "x86_64-linux"
        '("/bin/sh" "-c" "exec /bin/sh $ZILCH_CMDPath")
        `(("ZILCH_CMD" . ,command) ("passAsFile" . "ZILCH_CMD") . ,(ninja-build-config-environment (build-env-config env)))