Salvage guid fixes in template from data branch