Final fixes for batch loading