Fixes and Upgrades