Some VIM fixes