Download change and fixes