Poor handling of upgrades

Other O2 issues: