More 1.9.0 fixes