diff --git a/GNUmakefile b/GNUmakefile
index be540e63ea2..6e61563316e 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -28,7 +28,12 @@ gomod: ## Ensure chainlink's go dependencies are installed.
 
 .PHONY: gomodtidy
 gomodtidy: gomods ## Run go mod tidy on all modules.
-	gomods tidy
+	go mod tidy
+	cd ./core/scripts && go mod tidy
+	cd ./integration-tests && go mod tidy
+	cd ./integration-tests/load && go mod tidy
+	cd ./dashboard-lib && go mod tidy
+	cd ./charts/chainlink-cluster && go mod tidy
 
 .PHONY: godoc
 godoc: ## Install and run godoc
diff --git a/core/web/evm_transfer_controller.go b/core/web/evm_transfer_controller.go
index 47b7d8b4686..88d3dead4c8 100644
--- a/core/web/evm_transfer_controller.go
+++ b/core/web/evm_transfer_controller.go
@@ -113,7 +113,7 @@ func ValidateEthBalanceForTransfer(c *gin.Context, chain legacyevm.Chain, fromAd
 		return errors.Errorf("balance is too low for this transaction to be executed: %v", balance)
 	}
 
-	gasLimit := uint64(chain.Config().EVM().GasEstimator().LimitTransfer())
+	gasLimit := chain.Config().EVM().GasEstimator().LimitTransfer()
 	estimator := chain.GasEstimator()
 
 	amountWithFees, err := estimator.GetMaxCost(c, amount, nil, gasLimit, chain.Config().EVM().GasEstimator().PriceMaxKey(fromAddr))