More changes in an attempt to fix DS download issue