Changes for MacVim