[zsh] some fixes