latest fixes for upload