diff --git a/integration-tests/bor_health.sh b/integration-tests/bor_health.sh
index 0791d415fd..469992098c 100644
--- a/integration-tests/bor_health.sh
+++ b/integration-tests/bor_health.sh
@@ -11,5 +11,5 @@ do
     fi
 done
 
-echo $peers
-echo $block
+echo "$peers"
+echo "$block"
diff --git a/integration-tests/smoke_test.sh b/integration-tests/smoke_test.sh
index 4541ec5d4d..f5354ffde7 100644
--- a/integration-tests/smoke_test.sh
+++ b/integration-tests/smoke_test.sh
@@ -18,8 +18,8 @@ do
         exit 1
     fi
 
-    if (( $balance > $balanceInit )); then
-        if [ $stateSyncFound != "true" ]; then
+    if (( balance > balanceInit )); then
+        if [ "$stateSyncFound" != "true" ]; then
             stateSyncTime=$(( SECONDS - start_time ))
             stateSyncFound="true"
         fi
@@ -27,18 +27,18 @@ do
 
     checkpointID=$(curl -sL http://localhost:1317/checkpoints/latest | jq .result.id)
 
-    if [ $checkpointID != "null" ]; then
-        if [ $checkpointFound != "true" ]; then
+    if [ "$checkpointID" != "null" ]; then
+        if [ "$checkpointFound" != "true" ]; then
             checkpointTime=$(( SECONDS - start_time ))
             checkpointFound="true"
         fi
     fi
 
-    if [ $stateSyncFound == "true" ]  && [ $checkpointFound == "true" ]; then
+    if [ "$stateSyncFound" == "true" ] && [ "$checkpointFound" == "true" ]; then
         break
     fi
 
 done
 echo "Both state sync and checkpoint went through. All tests have passed!"
-echo "Time taken for state sync: $(printf '%02dm:%02ds\n'  $(($stateSyncTime%3600/60)) $(($stateSyncTime%60)))"
-echo "Time taken for checkpoint: $(printf '%02dm:%02ds\n'  $(($checkpointTime%3600/60)) $(($checkpointTime%60)))"
+echo "Time taken for state sync: $(printf '%02dm:%02ds\n' $((stateSyncTime%3600/60)) $((stateSyncTime%60)))"
+echo "Time taken for checkpoint: $(printf '%02dm:%02ds\n' $((checkpointTime%3600/60)) $((checkpointTime%60)))"
diff --git a/internal/cli/server/api_service.go b/internal/cli/server/api_service.go
index a9dba46a1f..78ddade84d 100644
--- a/internal/cli/server/api_service.go
+++ b/internal/cli/server/api_service.go
@@ -3,6 +3,7 @@ package server
 import (
 	"context"
 	"errors"
+	"strconv"
 
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/rpc"
@@ -113,6 +114,10 @@ func getRpcBlockNumberFromString(blockNumber string) (rpc.BlockNumber, error) {
 	case "safe":
 		return rpc.SafeBlockNumber, nil
 	default:
-		return rpc.BlockNumber(0), errors.New("invalid block number")
+		blckNum, err := strconv.ParseUint(blockNumber, 10, 64)
+		if err != nil {
+			return rpc.BlockNumber(0), errors.New("invalid block number")
+		}
+		return rpc.BlockNumber(blckNum), nil
 	}
 }