Some changes for vim