Archive loader fixes