Import file upload bug fixes