Fix problems with upload.py

No user interaction required