Minor vim improvements