Tweaks to mobile_upload