Fix some minor Vim annoyances