diff --git a/bin/aur.sh b/bin/aur.sh
index ef3ed14..ddd78a2 100755
--- a/bin/aur.sh
+++ b/bin/aur.sh
@@ -11,7 +11,7 @@ function throw {
 }
 
 # Figure out build directory
-tmpbuild=$TMPDIR/aur.sh.$$
+tmpbuild=${TMPDIR-/tmp}/aur.sh.$$
 build="${BUILDDIR:-$tmpbuild}"
 test -d "$build" || mkdir -p "$build" || exit 1
 
diff --git a/dotfiles/makepkg.conf b/dotfiles/makepkg.conf
index 60dc1e2..d09f7df 100644
--- a/dotfiles/makepkg.conf
+++ b/dotfiles/makepkg.conf
@@ -13,7 +13,7 @@ CFLAGS="`fix_march $CFLAGS`"
 CXXFLAGS="`fix_march $CXXFLAGS`"
 LDFLAGS="$LDFLAGS"
 
-MAKEFLAGS="-j4"
+MAKEFLAGS="-j`grep "cpu cores" /proc/cpuinfo | cut -d: -f2`"
 
 # Store stuff
 source "$DOTFILES/etc/aur.conf"
diff --git a/git/config b/git/config
index b57c5db..77e6dde 100644
--- a/git/config
+++ b/git/config
@@ -1,3 +1,6 @@
 [colors]
     ui = true
 
+[push]
+    default = simple
+
diff --git a/zsh/prezto b/zsh/prezto
index ee0b024..10cf701 160000
--- a/zsh/prezto
+++ b/zsh/prezto
@@ -1 +1 @@
-Subproject commit ee0b02464ca29b551169d0a33a43aeef979d78ea
+Subproject commit 10cf7018645fd9c09a0aa03c4ebac5ae6222c77e