Upload issues fixed