Minor changes for vim