updated some 2.x api details per EB issues