Get uploads working consistently

Woohoo!