9.1 fixes