WIP: Fixes Upgrades