Vim changes and others...