Add some upstream changes