Vim: More modifications