Updates for Triumph and some upstream changes