Some fixes in uploader script