Further vim changes