diff --git a/api/converter_utils.go b/api/converter_utils.go
index b3f971cb..4327102e 100644
--- a/api/converter_utils.go
+++ b/api/converter_utils.go
@@ -306,7 +306,7 @@ func signedTxnWithAdToTransaction(stxn *sdk.SignedTxnWithAD, extra rowData) (gen
 	var assetTransfer *generated.TransactionAssetTransfer
 	var application *generated.TransactionApplication
 	var stateProof *generated.TransactionStateProof
-	var heartbeat *generated.TransactionHeartBeat
+	var heartbeat *generated.TransactionHeartbeat
 
 	switch stxn.Txn.Type {
 	case sdk.PaymentTx:
@@ -512,7 +512,7 @@ func signedTxnWithAdToTransaction(stxn *sdk.SignedTxnWithAD, extra rowData) (gen
 		stateProof = &proofTxn
 	case sdk.HeartbeatTx:
 		hb := stxn.Txn.HeartbeatTxnFields
-		hbTxn := generated.TransactionHeartBeat{
+		hbTxn := generated.TransactionHeartbeat{
 			HbAddress: hb.HbAddress.String(),
 			HbProof: generated.HbProofFields{
 				HbPk:     byteSliceOmitZeroPtr(hb.HbProof.PK[:]),
@@ -574,9 +574,9 @@ func signedTxnWithAdToTransaction(stxn *sdk.SignedTxnWithAD, extra rowData) (gen
 		for _, t := range stxn.ApplyData.EvalDelta.InnerTxns {
 			extra2 := extra
 			if t.Txn.Type == sdk.ApplicationCallTx {
-				extra2.AssetID = uint64(t.ApplyData.ApplicationID)
+				extra2.AssetID = t.ApplyData.ApplicationID
 			} else if t.Txn.Type == sdk.AssetConfigTx {
-				extra2.AssetID = uint64(t.ApplyData.ConfigAsset)
+				extra2.AssetID = t.ApplyData.ConfigAsset
 			} else {
 				extra2.AssetID = 0
 			}
@@ -600,7 +600,7 @@ func signedTxnWithAdToTransaction(stxn *sdk.SignedTxnWithAD, extra rowData) (gen
 		PaymentTransaction:       payment,
 		KeyregTransaction:        keyreg,
 		StateProofTransaction:    stateProof,
-		HeartBeatTransaction:     heartbeat,
+		HeartbeatTransaction:     heartbeat,
 		ClosingAmount:            uint64Ptr(uint64(stxn.ClosingAmount)),
 		ConfirmedRound:           uint64Ptr(extra.Round),
 		IntraRoundOffset:         uint64Ptr(uint64(extra.Intra)),
@@ -767,9 +767,9 @@ func (si *ServerImplementation) transactionParamsToTransactionFilter(params gene
 
 func (si *ServerImplementation) maxAccountsErrorToAccountsErrorResponse(maxErr idb.MaxAPIResourcesPerAccountError) generated.ErrorResponse {
 	addr := maxErr.Address.String()
-	max := uint64(si.opts.MaxAPIResourcesPerAccount)
+	maxResults := si.opts.MaxAPIResourcesPerAccount
 	extraData := map[string]interface{}{
-		"max-results":           max,
+		"max-results":           maxResults,
 		"address":               addr,
 		"total-assets-opted-in": maxErr.TotalAssets,
 		"total-created-assets":  maxErr.TotalAssetParams,
diff --git a/api/generated/common/routes.go b/api/generated/common/routes.go
index 2db8b6e1..ebe0c71e 100644
--- a/api/generated/common/routes.go
+++ b/api/generated/common/routes.go
@@ -213,54 +213,54 @@ var swaggerSpec = []string{
 	"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",
-	"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",
-	"qxXorMdg/n8AAAD//wyLHMD35wAA",
+	"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",
+	"/P8AAAD//+g1BUr15wAA",
 }
 
 // GetSwagger returns the content of the embedded swagger specification file
diff --git a/api/generated/common/types.go b/api/generated/common/types.go
index dc19fdea..f62c6d78 100644
--- a/api/generated/common/types.go
+++ b/api/generated/common/types.go
@@ -847,11 +847,11 @@ type Transaction struct {
 	// Group \[grp\] Base64 encoded byte array of a sha512/256 digest. When present indicates that this transaction is part of a transaction group and the value is the sha512/256 hash of the transactions in that group.
 	Group *[]byte `json:"group,omitempty"`
 
-	// HeartBeatTransaction Fields for a heartbeat transaction.
+	// HeartbeatTransaction Fields for a heartbeat transaction.
 	//
 	// Definition:
-	// data/transactions/heartbeat.go : HeartBeatTxnFields
-	HeartBeatTransaction *TransactionHeartBeat `json:"heart-beat-transaction,omitempty"`
+	// data/transactions/heartbeat.go : HeartbeatTxnFields
+	HeartbeatTransaction *TransactionHeartbeat `json:"heartbeat-transaction,omitempty"`
 
 	// Id Transaction ID
 	Id *string `json:"id,omitempty"`
@@ -923,7 +923,7 @@ type Transaction struct {
 	// * \[afrz\] asset-freeze-transaction
 	// * \[appl\] application-transaction
 	// * \[stpf\] state-proof-transaction
-	// * \[hb\] heart-beat-transaction
+	// * \[hb\] heartbeat-transaction
 	TxType TransactionTxType `json:"tx-type"`
 }
 
@@ -937,7 +937,7 @@ type Transaction struct {
 // * \[afrz\] asset-freeze-transaction
 // * \[appl\] application-transaction
 // * \[stpf\] state-proof-transaction
-// * \[hb\] heart-beat-transaction
+// * \[hb\] heartbeat-transaction
 type TransactionTxType string
 
 // TransactionApplication Fields for application transactions.
@@ -1047,11 +1047,11 @@ type TransactionAssetTransfer struct {
 	Sender *string `json:"sender,omitempty"`
 }
 
-// TransactionHeartBeat Fields for a heartbeat transaction.
+// TransactionHeartbeat Fields for a heartbeat transaction.
 //
 // Definition:
-// data/transactions/heartbeat.go : HeartBeatTxnFields
-type TransactionHeartBeat struct {
+// data/transactions/heartbeat.go : HeartbeatTxnFields
+type TransactionHeartbeat struct {
 	// HbAddress \[hbad\] HbAddress is the account this txn is proving onlineness for.
 	HbAddress string `json:"hb-address"`
 
diff --git a/api/generated/v2/routes.go b/api/generated/v2/routes.go
index f9e87cec..58e7e67a 100644
--- a/api/generated/v2/routes.go
+++ b/api/generated/v2/routes.go
@@ -1354,93 +1354,93 @@ var swaggerSpec = []string{
 	"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",
-	"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",
+	"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",
+	"2ZkR5icnjycf/08AAAD//2KBnx2YhQEA",
 }
 
 // GetSwagger returns the content of the embedded swagger specification file
diff --git a/api/generated/v2/types.go b/api/generated/v2/types.go
index d33b0464..d420ed22 100644
--- a/api/generated/v2/types.go
+++ b/api/generated/v2/types.go
@@ -938,11 +938,11 @@ type Transaction struct {
 	// Group \[grp\] Base64 encoded byte array of a sha512/256 digest. When present indicates that this transaction is part of a transaction group and the value is the sha512/256 hash of the transactions in that group.
 	Group *[]byte `json:"group,omitempty"`
 
-	// HeartBeatTransaction Fields for a heartbeat transaction.
+	// HeartbeatTransaction Fields for a heartbeat transaction.
 	//
 	// Definition:
-	// data/transactions/heartbeat.go : HeartBeatTxnFields
-	HeartBeatTransaction *TransactionHeartBeat `json:"heart-beat-transaction,omitempty"`
+	// data/transactions/heartbeat.go : HeartbeatTxnFields
+	HeartbeatTransaction *TransactionHeartbeat `json:"heartbeat-transaction,omitempty"`
 
 	// Id Transaction ID
 	Id *string `json:"id,omitempty"`
@@ -1014,7 +1014,7 @@ type Transaction struct {
 	// * \[afrz\] asset-freeze-transaction
 	// * \[appl\] application-transaction
 	// * \[stpf\] state-proof-transaction
-	// * \[hb\] heart-beat-transaction
+	// * \[hb\] heartbeat-transaction
 	TxType TransactionTxType `json:"tx-type"`
 }
 
@@ -1028,7 +1028,7 @@ type Transaction struct {
 // * \[afrz\] asset-freeze-transaction
 // * \[appl\] application-transaction
 // * \[stpf\] state-proof-transaction
-// * \[hb\] heart-beat-transaction
+// * \[hb\] heartbeat-transaction
 type TransactionTxType string
 
 // TransactionApplication Fields for application transactions.
@@ -1138,11 +1138,11 @@ type TransactionAssetTransfer struct {
 	Sender *string `json:"sender,omitempty"`
 }
 
-// TransactionHeartBeat Fields for a heartbeat transaction.
+// TransactionHeartbeat Fields for a heartbeat transaction.
 //
 // Definition:
-// data/transactions/heartbeat.go : HeartBeatTxnFields
-type TransactionHeartBeat struct {
+// data/transactions/heartbeat.go : HeartbeatTxnFields
+type TransactionHeartbeat struct {
 	// HbAddress \[hbad\] HbAddress is the account this txn is proving onlineness for.
 	HbAddress string `json:"hb-address"`
 
diff --git a/api/indexer.oas2.json b/api/indexer.oas2.json
index a266975a..a53d4217 100644
--- a/api/indexer.oas2.json
+++ b/api/indexer.oas2.json
@@ -1994,7 +1994,7 @@
         "keyreg-transaction",
         "payment-transaction",
         "state-proof-transaction",
-        "heart-beat-transaction"
+        "heartbeat-transaction"
       ],
       "properties": {
         "application-transaction": {
@@ -2012,8 +2012,8 @@
         "state-proof-transaction": {
           "$ref": "#/definitions/TransactionStateProof"
         },
-        "heart-beat-transaction": {
-          "$ref": "#/definitions/TransactionHeartBeat"
+        "heartbeat-transaction": {
+          "$ref": "#/definitions/TransactionHeartbeat"
         },
         "auth-addr": {
           "description": "\\[sgnr\\] this is included with signed transactions when the signing address does not equal the sender. The backend can use this to ensure that auth addr is equal to the accounts auth addr.",
@@ -2115,7 +2115,7 @@
           "$ref": "#/definitions/TransactionSignature"
         },
         "tx-type": {
-          "description": "\\[type\\] Indicates what type of transaction this is. Different types have different fields.\n\nValid types, and where their fields are stored:\n* \\[pay\\] payment-transaction\n* \\[keyreg\\] keyreg-transaction\n* \\[acfg\\] asset-config-transaction\n* \\[axfer\\] asset-transfer-transaction\n* \\[afrz\\] asset-freeze-transaction\n* \\[appl\\] application-transaction\n* \\[stpf\\] state-proof-transaction\n* \\[hb\\] heart-beat-transaction",
+          "description": "\\[type\\] Indicates what type of transaction this is. Different types have different fields.\n\nValid types, and where their fields are stored:\n* \\[pay\\] payment-transaction\n* \\[keyreg\\] keyreg-transaction\n* \\[acfg\\] asset-config-transaction\n* \\[axfer\\] asset-transfer-transaction\n* \\[afrz\\] asset-freeze-transaction\n* \\[appl\\] application-transaction\n* \\[stpf\\] state-proof-transaction\n* \\[hb\\] heartbeat-transaction",
           "type": "string",
           "enum": [
             "pay",
@@ -2283,8 +2283,8 @@
         }
       }
     },
-    "TransactionHeartBeat": {
-      "description": "Fields for a heartbeat transaction.\n\nDefinition:\ndata/transactions/heartbeat.go : HeartBeatTxnFields",
+    "TransactionHeartbeat": {
+      "description": "Fields for a heartbeat transaction.\n\nDefinition:\ndata/transactions/heartbeat.go : HeartbeatTxnFields",
       "type": "object",
       "required": [
         "hb-address",
diff --git a/api/indexer.oas3.yml b/api/indexer.oas3.yml
index da8102d1..10c43aad 100644
--- a/api/indexer.oas3.yml
+++ b/api/indexer.oas3.yml
@@ -1977,8 +1977,8 @@
             "pattern": "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$",
             "type": "string"
           },
-          "heart-beat-transaction": {
-            "$ref": "#/components/schemas/TransactionHeartBeat"
+          "heartbeat-transaction": {
+            "$ref": "#/components/schemas/TransactionHeartbeat"
           },
           "id": {
             "description": "Transaction ID",
@@ -2061,7 +2061,7 @@
             "$ref": "#/components/schemas/TransactionStateProof"
           },
           "tx-type": {
-            "description": "\\[type\\] Indicates what type of transaction this is. Different types have different fields.\n\nValid types, and where their fields are stored:\n* \\[pay\\] payment-transaction\n* \\[keyreg\\] keyreg-transaction\n* \\[acfg\\] asset-config-transaction\n* \\[axfer\\] asset-transfer-transaction\n* \\[afrz\\] asset-freeze-transaction\n* \\[appl\\] application-transaction\n* \\[stpf\\] state-proof-transaction\n* \\[hb\\] heart-beat-transaction",
+            "description": "\\[type\\] Indicates what type of transaction this is. Different types have different fields.\n\nValid types, and where their fields are stored:\n* \\[pay\\] payment-transaction\n* \\[keyreg\\] keyreg-transaction\n* \\[acfg\\] asset-config-transaction\n* \\[axfer\\] asset-transfer-transaction\n* \\[afrz\\] asset-freeze-transaction\n* \\[appl\\] application-transaction\n* \\[stpf\\] state-proof-transaction\n* \\[hb\\] heartbeat-transaction",
             "enum": [
               "pay",
               "keyreg",
@@ -2228,8 +2228,8 @@
         ],
         "type": "object"
       },
-      "TransactionHeartBeat": {
-        "description": "Fields for a heartbeat transaction.\n\nDefinition:\ndata/transactions/heartbeat.go : HeartBeatTxnFields",
+      "TransactionHeartbeat": {
+        "description": "Fields for a heartbeat transaction.\n\nDefinition:\ndata/transactions/heartbeat.go : HeartbeatTxnFields",
         "properties": {
           "hb-address": {
             "description": "\\[hbad\\] HbAddress is the account this txn is proving onlineness for.",
diff --git a/idb/postgres/internal/writer/write_txn.go b/idb/postgres/internal/writer/write_txn.go
index 4ee76983..97f819fb 100644
--- a/idb/postgres/internal/writer/write_txn.go
+++ b/idb/postgres/internal/writer/write_txn.go
@@ -171,7 +171,6 @@ func yieldTransactions(ctx context.Context, block *types.Block, modifiedTxns []t
 			return fmt.Errorf("yieldTransactions() ProposerPayout ctx.Err(): %w", ctx.Err())
 		case outCh <- row:
 		}
-		intra++
 	}
 
 	return nil
diff --git a/idb/postgres/internal/writer/write_txn_participation.go b/idb/postgres/internal/writer/write_txn_participation.go
index 38b5add5..d458d854 100644
--- a/idb/postgres/internal/writer/write_txn_participation.go
+++ b/idb/postgres/internal/writer/write_txn_participation.go
@@ -131,7 +131,6 @@ func AddTransactionParticipation(block *types.Block, tx pgx.Tx) error {
 		for j := range participants {
 			rows = append(rows, []interface{}{participants[j][:], uint64(block.Round), next})
 		}
-		next++
 	}
 
 	_, err := tx.CopyFrom(