more fixes for 1.8

only new issue fixed is gh-4266