[VIM] Some fixes to commands