Fixed loading upgrades