Fix bugs in vimify