diff --git a/tokens/src/components/IconButton.json b/tokens/src/components/IconButton.json
index 1bce22ebdd..6f7da42621 100644
--- a/tokens/src/components/IconButton.json
+++ b/tokens/src/components/IconButton.json
@@ -32,7 +32,7 @@
       "diameter": {
         "md": { "value": "2.75rem", "source": "$btn-icon-diameter-md" },
         "sm": { "value": "2.25rem", "source": "$btn-icon-diameter-sm" },
-        "inline": { "value": "calc({typography.line-height.base.value} + .1em)", "source": "$btn-icon-diameter-inline" }
+        "inline": { "value": "calc({typography.line-height.base} + .1em)", "source": "$btn-icon-diameter-inline" }
       }
     }
   }
diff --git a/tokens/src/components/Nav.json b/tokens/src/components/Nav.json
index 417176bce8..f1fa7f32ff 100644
--- a/tokens/src/components/Nav.json
+++ b/tokens/src/components/Nav.json
@@ -107,7 +107,7 @@
   "size": {
     "nav": {
       "pills": {
-        "border-radius": { "value": "{size.border.radius.base.value}", "source": "$nav-pills-border-radius" }
+        "border-radius": { "value": "{size.border.radius.base}", "source": "$nav-pills-border-radius" }
       },
       "tabs": {
         "border": {
@@ -126,7 +126,7 @@
         }
       },
       "divider": {
-        "margin-y": { "value": "calc({spacing.spacer.base.value} / 2)", "source": "$nav-divider-margin-y" }
+        "margin-y": { "value": "calc({spacing.spacer.base} / 2)", "source": "$nav-divider-margin-y" }
       }
     }
   }