Fix location issue and fix download issue