diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1f36510fda30..399e8b442142 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -35,8 +35,8 @@ jobs:
             export GOARCH=amd64
             wget https://golang.org/dl/go1.15.5.linux-amd64.tar.gz
             tar -xzvf go1.15.5.linux-amd64.tar.gz
-            go/bin/go build ./cmd/geth -o geth-amd64
-            CC=aarch64-linux-gnu-gcc  CGO_ENABLED=1 GOARCH=arm64  go/bin/go build ./cmd/geth -o geth-arm64
+            go/bin/go build -o geth-amd64 ./cmd/geth
+            CC=aarch64-linux-gnu-gcc CGO_ENABLED=1 GOARCH=arm64  go/bin/go build -o geth-arm64 ./cmd/geth
       # - run:
       #     name: build image
       #     command: |
diff --git a/replica/kafka_events.go b/replica/kafka_events.go
index 978b12e56f6c..269ba7604b85 100644
--- a/replica/kafka_events.go
+++ b/replica/kafka_events.go
@@ -898,7 +898,7 @@ func (consumer *KafkaEventConsumer) Start() {
 }
 
 
-func NewKafkaEventConsumerFromURLs(brokerURL, topic string, lastEmittedBlock common.Hash, offsets map[int32]int64, rollback int64, startingBlockNumber uint64) (EventConsumer, error) {
+func NewKafkaEventConsumerFromURLs(brokerURL, topic string, lastEmittedBlock common.Hash, offsets map[int32]int64, rollback int64, startingBlockNumber uint64, finishedLimit int) (EventConsumer, error) {
   brokers, config := cdc.ParseKafkaURL(brokerURL)
   if err := cdc.CreateTopicIfDoesNotExist(brokerURL, topic, -1, nil); err != nil {
     return nil, err
@@ -948,7 +948,7 @@ func NewKafkaEventConsumerFromURLs(brokerURL, topic string, lastEmittedBlock com
       finished: make(map[common.Hash]bool),
       oldFinished: make(map[common.Hash]bool),
       skipped: make(map[common.Hash]bool),
-      finishedLimit: 128,
+      finishedLimit: finishedLimit,
       lastEmittedBlock: lastEmittedBlock,
       pendingEmits: make(map[common.Hash]map[common.Hash]struct{}),
       pendingHashes: make(map[common.Hash]struct{}),