PLAT-4091 - Batch schema fixes for stress testing