Upgrade for upstream changes