diff --git a/build_library/qemu_template.sh b/build_library/qemu_template.sh
index a1d25b01f4..b04917a99c 100755
--- a/build_library/qemu_template.sh
+++ b/build_library/qemu_template.sh
@@ -25,17 +25,22 @@ Any arguments after -a and -p will be passed through to qemu, -- may be
 used as an explicit separator. See the qemu(1) man page for more details.
 "
 
+script_args=1
 while getopts ":a:p:vh" OPTION
 do
     case $OPTION in
-        a) SSH_KEYS="$OPTARG"; shift 2 ;;
-        p) SSH_PORT="$OPTARG"; shift 2 ;;
-        v) set -x; shift ;;
+        a) SSH_KEYS="$OPTARG" ;;
+        p) SSH_PORT="$OPTARG" ;;
+        v) set -x ;;
         h) echo "$USAGE"; exit ;;
         ?) break ;;
     esac
+    script_args=$OPTIND
 done
 
+shift $((script_args - 1))
+[ "$1" == "--" ] && shift
+
 
 METADATA=$(mktemp -t -d coreos-meta-data.XXXXXXXXXX)
 if [ $? -ne 0 ] || [ ! -d "$METADATA" ]; then
diff --git a/build_library/set_lsb_release b/build_library/set_lsb_release
index fc1eb2cb01..f5c016cf9f 100755
--- a/build_library/set_lsb_release
+++ b/build_library/set_lsb_release
@@ -71,7 +71,7 @@ sudo mkdir -p "${ROOT_FS_DIR}/etc"
 sudo_clobber "${ROOT_FS_DIR}/etc/lsb-release" <<EOF
 DISTRIB_ID=$COREOS_VERSION_NAME
 DISTRIB_RELEASE=$COREOS_VERSION_STRING
-DISTRIB_CODENAME="Wearing A Party Hat"
+DISTRIB_CODENAME="West Coast Style"
 DISTRIB_DESCRIPTION="$COREOS_VERSION_NAME $COREOS_VERSION_DESCRIPTION"
 COREOS_RELEASE_BOARD=$FLAGS_board
 COREOS_RELEASE_DESCRIPTION="$COREOS_VERSION_DESCRIPTION"