more fixes for gvim