updates for J3.x compatibility