Update Batch Minor Fixes