Better zsh support