Changes to allow gvim to work