DDF-650: Download bugs fixed