build 1.9 fixes