fixes for batch-amjob