diff --git a/vanilla_first_setup/scripts/keyboard b/vanilla_first_setup/scripts/keyboard
index e167c3b6..c48f1f83 100755
--- a/vanilla_first_setup/scripts/keyboard
+++ b/vanilla_first_setup/scripts/keyboard
@@ -1,7 +1,7 @@
 #!/bin/bash
 if [ -z "$1" ] || [ -z "$2" ]; then
     echo "usage:"
-    echo "keyboard <model> <layout> <variant>"
+    echo "keyboard <model> <layout> [variant]"
     exit 5
 fi
 
diff --git a/vanilla_first_setup/scripts/timezone b/vanilla_first_setup/scripts/timezone
index f9bdf66f..de6d704c 100755
--- a/vanilla_first_setup/scripts/timezone
+++ b/vanilla_first_setup/scripts/timezone
@@ -11,4 +11,9 @@ if ! [ "$UID" == "0" ]; then
 fi
 
 echo "$1" > /etc/timezone
+CODE_ONE="$?"
+rm /etc/localtime
 ln -sf "/usr/share/zoneinfo/$1" /etc/localtime
+CODE_TWO="$?"
+
+exit $(($CODE_ONE + $CODE_TWO))