diff --git a/subgraph/DisputeTemplateRegistry/src/DisputeTemplateRegistry.ts b/subgraph/DisputeTemplateRegistry/src/DisputeTemplateRegistry.ts
index 5395e8166..b3e990f88 100644
--- a/subgraph/DisputeTemplateRegistry/src/DisputeTemplateRegistry.ts
+++ b/subgraph/DisputeTemplateRegistry/src/DisputeTemplateRegistry.ts
@@ -4,7 +4,7 @@ import { DisputeTemplate } from "../generated/schema";
 export function handleDisputeTemplate(event: DisputeTemplateEvent): void {
   const disputeTemplateId = event.params._templateId.toString();
   const disputeTemplate = new DisputeTemplate(disputeTemplateId);
-  disputeTemplate.templateTag = event.params._templateTag.toString();
+  disputeTemplate.templateTag = event.params._templateTag.toHexString();
   disputeTemplate.templateData = event.params._templateData.toString();
   disputeTemplate.templateDataMappings = event.params._templateDataMappings.toString();
   disputeTemplate.save();
diff --git a/subgraph/src/entities/Penalty.ts b/subgraph/src/entities/Penalty.ts
index 213fa6b31..ec6e6c8f8 100644
--- a/subgraph/src/entities/Penalty.ts
+++ b/subgraph/src/entities/Penalty.ts
@@ -6,7 +6,7 @@ export function updatePenalty(event: TokenAndETHShift): void {
   const disputeID = event.params._disputeID.toString();
   const roundIndex = event.params._roundID.toString();
   const roundID = `${disputeID}-${roundIndex}`;
-  const jurorAddress = event.params._account;
+  const jurorAddress = event.params._account.toHexString();
   const penaltyID = `${roundID}-${jurorAddress}`;
   const penalty = Penalty.load(penaltyID);
   if (penalty) {