Fixes required for upgrade