Fixes to upload bundle