Fixes for bash

Considering moving back to bash again since zsh has pissed me off one too many
times.