Some vim changes