Small Debug Batch Changes