A couple of vim changes.