diff --git a/node/execution/intrinsics/token/token_execution_engine.go b/node/execution/intrinsics/token/token_execution_engine.go
index c68f8c4..6968399 100644
--- a/node/execution/intrinsics/token/token_execution_engine.go
+++ b/node/execution/intrinsics/token/token_execution_engine.go
@@ -236,6 +236,7 @@ func NewTokenExecutionEngine(
 		keyManager:            keyManager,
 		clockStore:            clockStore,
 		coinStore:             coinStore,
+		hypergraphStore:       hypergraphStore,
 		keyStore:              keyStore,
 		pubSub:                pubSub,
 		inclusionProver:       inclusionProver,
@@ -452,6 +453,10 @@ func (e *TokenExecutionEngine) rebuildHypergraph() {
 	for iter.First(); iter.Valid(); iter.Next() {
 		key := make([]byte, len(iter.Key()[2:]))
 		copy(key, iter.Key()[2:])
+		e.logger.Debug(
+			"encrypting coin",
+			zap.String("address", hex.EncodeToString(key)),
+		)
 		data := e.mpcithVerEnc.Encrypt(iter.Value(), config.GetGenesis().Beacon)
 		compressed := []hypergraph.Encrypted{}
 		for _, d := range data {
@@ -476,6 +481,10 @@ func (e *TokenExecutionEngine) rebuildHypergraph() {
 	for iter.First(); iter.Valid(); iter.Next() {
 		key := make([]byte, len(iter.Key()[2:]))
 		copy(key, iter.Key()[2:])
+		e.logger.Debug(
+			"encrypting pre-coin proof",
+			zap.String("address", hex.EncodeToString(key)),
+		)
 		data := e.mpcithVerEnc.Encrypt(iter.Value(), config.GetGenesis().Beacon)
 		compressed := []hypergraph.Encrypted{}
 		for _, d := range data {
@@ -492,14 +501,14 @@ func (e *TokenExecutionEngine) rebuildHypergraph() {
 		}
 	}
 	iter.Close()
-	e.logger.Info("saving rebuilt state tree")
+	e.logger.Info("saving rebuilt hypergraph")
 
 	txn, err := e.clockStore.NewTransaction(false)
 	if err != nil {
 		panic(err)
 	}
 
-	e.logger.Info("committing state tree")
+	e.logger.Info("committing hypergraph")
 
 	roots := e.hypergraph.Commit()
 
@@ -1179,7 +1188,7 @@ func (e *TokenExecutionEngine) ProcessFrame(
 		}
 	}
 
-	e.logger.Info("committing state tree")
+	e.logger.Info("committing hypergraph")
 
 	roots := hg.Commit()
 
diff --git a/node/hypergraph/application/hypergraph.go b/node/hypergraph/application/hypergraph.go
index de5aff3..7565d3b 100644
--- a/node/hypergraph/application/hypergraph.go
+++ b/node/hypergraph/application/hypergraph.go
@@ -373,7 +373,11 @@ func (set *IdSet) Add(atom Atom) error {
 }
 
 func (set *IdSet) GetSize() *big.Int {
-	return set.tree.GetSize()
+	size := set.tree.GetSize()
+	if size == nil {
+		size = big.NewInt(0)
+	}
+	return size
 }
 
 func (set *IdSet) Delete(atom Atom) bool {
@@ -407,7 +411,7 @@ type Hypergraph struct {
 
 func NewHypergraph() *Hypergraph {
 	return &Hypergraph{
-		size:             new(big.Int),
+		size:             big.NewInt(0),
 		vertexAdds:       make(map[ShardKey]*IdSet),
 		vertexRemoves:    make(map[ShardKey]*IdSet),
 		hyperedgeAdds:    make(map[ShardKey]*IdSet),