ZSH fixes