more quick fixes for 1.9.0

Fixes #1670 #1731 #1733