diff --git a/ubuntu-14.04/scripts/base.sh b/ubuntu-14.04/scripts/base.sh
index 07114ad..43e6360 100644
--- a/ubuntu-14.04/scripts/base.sh
+++ b/ubuntu-14.04/scripts/base.sh
@@ -4,7 +4,14 @@
 apt-get -y dist-upgrade
 
 # Useful tools
-apt-get -y install curl tmux vim-nox byobu
+apt-get -y install curl tmux vim-nox byobu iputils-ping traceroute htop
+
+# Tmux fixes
+cat << 'EOF' >> /etc/tmux.conf
+set -g default-terminal "screen-256color"
+set -g set-titles on
+set -g xterm-keys on
+EOF
 
 # Cleanup old kernels, ensure latest is installed via virtual package
 apt-get purge -y linux-image-* linux-headers-*
diff --git a/ubuntu-14.04/scripts/salt.sh b/ubuntu-14.04/scripts/salt.sh
index cfdb2f9..ceec857 100644
--- a/ubuntu-14.04/scripts/salt.sh
+++ b/ubuntu-14.04/scripts/salt.sh
@@ -1,5 +1 @@
-#!/bin/sh
-curl -L https://bootstrap.saltstack.com | sudo sh -s --
-curl -k -L https://bootstrap.saltstack.com | sudo sh -s --
-rm -f /tmp/install_salt.sh
-
+apt-get -y install salt-minion reclass