diff --git a/coordinator/pipeline.go b/coordinator/pipeline.go
index 91c1aa1..caae3b4 100644
--- a/coordinator/pipeline.go
+++ b/coordinator/pipeline.go
@@ -311,7 +311,6 @@ func (p *Pipeline) Start(batchNum common.BatchNum,
 					continue
 				}
 				err := p.waitServerProof(p.ctx, batchInfo)
-				batchInfo.ServerProof = nil
 				if p.ctx.Err() != nil {
 					continue
 				} else if err != nil {
@@ -326,6 +325,7 @@ func (p *Pipeline) Start(batchNum common.BatchNum,
 				}
 				// We are done with this serverProof, add it back to the pool
 				p.proversPool.Add(p.ctx, batchInfo.ServerProof)
+				// batchInfo.ServerProof = nil
 				p.txManager.AddBatch(p.ctx, batchInfo)
 			}
 		}
diff --git a/coordinator/txmanager.go b/coordinator/txmanager.go
index d957779..6e5a193 100644
--- a/coordinator/txmanager.go
+++ b/coordinator/txmanager.go
@@ -140,6 +140,7 @@ func (t *TxManager) NewAuth(ctx context.Context) (*bind.TransactOpts, error) {
 		return nil, tracerr.Wrap(err)
 	}
 	inc := new(big.Int).Set(gasPrice)
+	// TODO: Replace this by a value of percentage
 	const gasPriceDiv = 100
 	inc.Div(inc, new(big.Int).SetUint64(gasPriceDiv))
 	gasPrice.Add(gasPrice, inc)