diff --git a/src/mappings/helpers/helpers.ts b/src/mappings/helpers/helpers.ts
index 3b423cf..b19d91e 100644
--- a/src/mappings/helpers/helpers.ts
+++ b/src/mappings/helpers/helpers.ts
@@ -191,7 +191,7 @@ export function createOrLoadPaymentSource(paymentAddress: Bytes): PaymentSource
   let id = paymentAddress.toHexString()
   let paymentSource = PaymentSource.load(id)
   if (paymentSource == null) {
-    let paymentSource = new PaymentSource(id)
+    paymentSource = new PaymentSource(id)
     paymentSource.graphNetwork = "1"
     paymentSource.totalQueryFees = BigInt.fromI32(0)
     paymentSource.totalIndexerQueryFeesCollected = BigInt.fromI32(0)
@@ -211,7 +211,7 @@ export function createOrLoadIndexerQueryFeePaymentAggregation(paymentAddress: By
   let id = paymentAddress.toHexString().concat("-").concat(indexerAddress.toHexString())
   let aggregation = IndexerQueryFeePaymentAggregation.load(id)
   if (aggregation == null) {
-    let aggregation = new IndexerQueryFeePaymentAggregation(id)
+    aggregation = new IndexerQueryFeePaymentAggregation(id)
     aggregation.indexer = indexerAddress.toHexString()
     aggregation.paymentSource = paymentAddress.toHexString()
     aggregation.queryFeesCollected = BigInt.fromI32(0)
diff --git a/src/mappings/staking.ts b/src/mappings/staking.ts
index 75d3f70..c720dbd 100644
--- a/src/mappings/staking.ts
+++ b/src/mappings/staking.ts
@@ -397,7 +397,7 @@ export function handleAllocationCollected(event: AllocationCollected): void {
   let subgraphDeploymentID = event.params.subgraphDeploymentID.toHexString()
   let indexerID = event.params.indexer.toHexString()
   let allocationID = event.params.allocationID.toHexString()
-  let paymentAddress = event.transaction.from
+  let paymentAddress = event.params.from
 
   // update indexer
   let indexer = Indexer.load(indexerID)!
@@ -705,7 +705,7 @@ export function handleRebateCollected(event: RebateCollected): void {
   let subgraphDeploymentID = event.params.subgraphDeploymentID.toHexString()
   let indexerID = event.params.indexer.toHexString()
   let allocationID = event.params.allocationID.toHexString()
-  let paymentAddress = event.transaction.from
+  let paymentAddress = event.params.assetHolder
 
   // update indexer
   let indexer = Indexer.load(indexerID)!