Several fixes for a better zshrc experience