diff --git a/tools/build/onos-buck b/tools/build/onos-buck
index 9258dd9..91f0d07 100755
--- a/tools/build/onos-buck
+++ b/tools/build/onos-buck
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 # -----------------------------------------------------------------------------
 # Runs the custom version of Buck required by ONOS.
 # -----------------------------------------------------------------------------
diff --git a/tools/build/onos-lib-gen b/tools/build/onos-lib-gen
index 1bed9cf..5316a7a 100755
--- a/tools/build/onos-lib-gen
+++ b/tools/build/onos-lib-gen
@@ -1,5 +1,7 @@
 #!/bin/bash
 
-cd $(buck root 2>/dev/null)
+set -e
+cd $(onos-buck root 2>/dev/null)
+JAR=$(onos-buck build //tools/build/libgen:libgen --show-output 2>/dev/null | tail -1 | cut -d\  -f2)
 
-java -jar $(buck build //tools/build/libgen:libgen --show-output 2>/dev/null | tail -1 | cut -d' ' -f2) lib/deps.json lib/BUCK
+java -jar $JAR lib/deps.json lib/BUCK
diff --git a/tools/package/BUCK b/tools/package/BUCK
index c02b4c9..31896f3 100644
--- a/tools/package/BUCK
+++ b/tools/package/BUCK
@@ -100,11 +100,10 @@
 sources = [ '$(location :onos-features)', ]
 sources += staged_repos + staged_apps
 
-import time
 genrule(
   name = 'onos-package',
   out = 'onos.tar.gz',
-  bash = 'echo %s >/dev/null; $(exe //buck-tools:onos-stage) $OUT $(location :onos-karaf) ' % time.time() + ' '.join(sources),
+  bash = '$(exe //buck-tools:onos-stage) $OUT $(location :onos-karaf) ' + ' '.join(sources),
   visibility = [ 'PUBLIC' ],
 )