Minor upstream changes