AutoBatch fixing imports