Misc small vim changes