Minor fixes for gvim