Batch creation script fixes