R4R: Final Upgrade Fixes