gvim related changes