Fixing up tracker uploading