Fixed a bug with first time uploads - was bad callbacks not nested correctly