[zsh] Some changes