more 1.5 fixes