bug fixes for J2.5 compatibility