Fixed a couple bugs with Upgrade