Minor fixes for bulk upload.