Fixes to upload check functions