Update changes to Third Party and fix GS errors