Fixed issues with gooruUid/partyUid