Upgrade and fix