Tiny changes and download failure checks