Some upload changes...