Fixing bupload issues