Uploader issues

Tries to fix some uploader issues.
Also gives more verbose debug output regarding the uploader rescue process.