More vim changes