Download fixes