Fixing Vim issues