R4R: Fixes Upgrades

nit, this seems unreferenced