Some fixes for MacVim