Improvements to upgrading