Remove compiler warnings related to Batch upgrade