more 1.5 fixes (when will it end?)