More THIRD_PARTY fixes