Additional fixes to download package