Apply new fixes by Christian Brabandt

https://groups.google.com/d/msg/vim_dev/ZGIQQPtVhkI/tHhHnbP1aU4J