Batch compilation fixes