diff --git a/core_roller_upload b/core_roller_upload
index 173825b295..387236ca43 100755
--- a/core_roller_upload
+++ b/core_roller_upload
@@ -61,4 +61,4 @@ updateservicectl \
         --app-id="${FLAGS_app_id}" \
         --file="${FLAGS_payload}" \
         --url="${HTTP_URL}" \
-	--version="${FLAGS_version}"
+        --version="${FLAGS_version}"
diff --git a/offline_signing/download.sh b/offline_signing/download.sh
index bd45bebed5..d2f305b4aa 100755
--- a/offline_signing/download.sh
+++ b/offline_signing/download.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
 
 set -ex
-VERSION="$1"
-GS="gs://builds.release.core-os.net/stable/boards/amd64-usr/$VERSION"
+BOARD="$1"
+VERSION="$2"
+GS="gs://builds.release.core-os.net/stable/boards/$BOARD/$VERSION"
 
-cd "${2:-.}"
+cd "${3:-.}"
 
 gsutil cp \
     "${GS}/coreos_production_image.vmlinuz" \