Upload argument interface and fixes