Minor tweaks in ClaimGuid