applyin fixes and upgrades again