diff --git a/ercs/calldata-erc20-tokens.json b/ercs/calldata-erc20-tokens.json
index c6dc0dc..675e780 100644
--- a/ercs/calldata-erc20-tokens.json
+++ b/ercs/calldata-erc20-tokens.json
@@ -67,7 +67,7 @@
                         "label": "Amount",
                         "format": "tokenAmount",
                         "params": {
-                            "tokenPath": "$.context.contract.address"
+                            "tokenPath": "$.context.contract.deployments.[0].address"
                         }
                     }
                 ],
@@ -86,7 +86,7 @@
                         "label": "Amount",
                         "format": "tokenAmount",
                         "params": {
-                            "tokenPath": "$.context.contract.address",
+                            "tokenPath": "$.context.contract.deployments.[0].address",
                             "threshold": "0x8000000000000000000000000000000000000000000000000000000000000000"
                         }
                     }
diff --git a/ercs/calldata-erc721-nfts.json b/ercs/calldata-erc721-nfts.json
index a3f589b..8afcf8c 100644
--- a/ercs/calldata-erc721-nfts.json
+++ b/ercs/calldata-erc721-nfts.json
@@ -136,15 +136,15 @@
                         "label": "Collection",
                         "format": "addressName",
                         "params": {
-                            "type": "nft"
+                            "types": ["collection"]
                         }
                     },
                     { "path": "_operator", "$ref": "$.display.definitions.operator" },
-                    { 
+                    {
                         "path": "_approved",
-                        "label": "Access rights", 
+                        "label": "Access rights",
                         "format": "enum",
-                        "$params": { "$ref": "$.metadata.enums.rights" }
+                        "params": { "$ref": "$.metadata.enums.rights" }
                     }
                 ]
             }