Some more vim changes