More fixes to aws uploading.