more 1.5 compat fixes
more 1.5 fixes