Updates for upstream changes