more 1.9 fixes