A few fixes for vim