Prep for upload script fixing