Core: downloads related fixes