Upload wizard bug fixes