Fixed upload issues