Cosmetic fixes and better error message for batch-related migration failure.