A few fixes for the Upgrade Guide