fixed 2 issues with Vim