Minor zsh and vim fixes