More fixes for downconversion of batch apis