R4R: Fixes Upgrades