Added some fixes for vim and zsh