Commit work.
Fixing the upgrade path.