applying fixes and upgrades