fixes for creating deployment batches