Improve zsh shell switching