Upload controller fixes