[zsh] Various post-oh-my-zsh bugfixes