diff --git a/proxy/deploy-test.sh b/proxy/deploy-test.sh
index a0df058f2..3ebbfda0f 100755
--- a/proxy/deploy-test.sh
+++ b/proxy/deploy-test.sh
@@ -5,8 +5,7 @@ echo "Deploy test..."
 
 solana config set -u $SOLANA_URL
 solana address || solana-keygen new --no-passphrase
-solana program dump "$EVM_LOADER" ./evm_loader.dump
-export $(/spl/bin/neon-cli --evm_loader "$EVM_LOADER" neon-elf-params ./evm_loader.dump)
+export $(/spl/bin/neon-cli --url $SOLANA_URL --evm_loader "$EVM_LOADER" neon-elf-params)
 
 curl -v --header "Content-Type: application/json" --data '{"method":"eth_blockNumber","id":1,"jsonrpc":"2.0","params":[]}' $PROXY_URL
 
diff --git a/proxy/environment.py b/proxy/environment.py
index 7ba268c0a..05711ac62 100644
--- a/proxy/environment.py
+++ b/proxy/environment.py
@@ -40,16 +40,7 @@ def call(self, *args):
             raise
 
 def read_elf_params(out_dict):
-    logger.debug('load for solana_url={} and evm_loader_id={}'.format(solana_url, evm_loader_id))
-    res = solana_cli().call('program', 'dump', evm_loader_id, './evm_loader.dump')
-    substr = "Wrote program to "
-    path = ""
-    for line in res.splitlines():
-        if line.startswith(substr):
-            path = line[len(substr):].strip()
-    if path == "":
-        raise Exception("cannot program dump for ", evm_loader_id)
-    for param in neon_cli().call("neon-elf-params", path).splitlines():
+    for param in neon_cli().call("neon-elf-params").splitlines():
         if param.startswith('NEON_') and '=' in param:
             v = param.split('=')
             out_dict[v[0]] = v[1]
diff --git a/proxy/plugin/solana_rest_api.py b/proxy/plugin/solana_rest_api.py
index 53f7d217a..52cfe1434 100644
--- a/proxy/plugin/solana_rest_api.py
+++ b/proxy/plugin/solana_rest_api.py
@@ -123,8 +123,12 @@ def process_block_tag(self, tag):
             slot = int(self.client.get_slot(commitment=Confirmed)["result"])
         elif tag in ('earliest', 'pending'):
             raise Exception("Invalid tag {}".format(tag))
-        else:
+        elif isinstance(tag, str):
             slot = int(tag, 16)
+        elif isinstance(tag, int):
+            slot = tag
+        else:
+            raise Exception(f'Failed to parse block tag: {tag}')
         return slot
 
     def eth_blockNumber(self):
diff --git a/proxy/run-test-proxy.sh b/proxy/run-test-proxy.sh
index 5df1ad4ab..4b9af9199 100755
--- a/proxy/run-test-proxy.sh
+++ b/proxy/run-test-proxy.sh
@@ -9,8 +9,7 @@ solana config set -u $SOLANA_URL
 
 echo "Dumping evm_loader and extracting ELF parameters"
 export EVM_LOADER=$(solana address -k /spl/bin/evm_loader-keypair.json)
-solana program dump "$EVM_LOADER" ./evm_loader.dump
-export $(/spl/bin/neon-cli --evm_loader="$EVM_LOADER" neon-elf-params ./evm_loader.dump)
+export $(/spl/bin/neon-cli --url $SOLANA_URL --evm_loader="$EVM_LOADER" neon-elf-params)
 
 /spl/bin/create-test-accounts.sh 1