fix more vim issues (fixes #1930)