Some minor changes from using the setup.sh on a clean install of Debian.