diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/TenantConfiguration/GetTenantConfiguration.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/TenantConfiguration/GetTenantConfiguration.json
index b945a54fcc08..c15c075b4649 100644
--- a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/TenantConfiguration/GetTenantConfiguration.json
+++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/TenantConfiguration/GetTenantConfiguration.json
@@ -13,6 +13,7 @@
           "enforcePrivateMarkdownStorage": true
         }
       }
-    }
+    },
+    "404": {}
   }
 }
diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/getDashboard.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/getDashboard.json
index b397a514c868..37ed26e67117 100644
--- a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/getDashboard.json
+++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/getDashboard.json
@@ -54,6 +54,7 @@
           "anotherKey": "anotherValue"
         }
       }
-    }
+    },
+    "404": {}
   }
 }
diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/updateDashboard.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/updateDashboard.json
index b993eb1ae2e5..300e75b6c06f 100644
--- a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/updateDashboard.json
+++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/updateDashboard.json
@@ -60,6 +60,7 @@
           "anotherKey": "anotherValue2"
         }
       }
-    }
+    },
+    "404": {}
   }
 }
diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json
index 32b291f51c49..d3494deaa119 100644
--- a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json
+++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json
@@ -213,6 +213,9 @@
               "$ref": "#/definitions/Dashboard"
             }
           },
+          "404": {
+            "description": "Not found. Dashboard with provided id doesn't exist."
+          },
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
@@ -268,6 +271,9 @@
               "$ref": "#/definitions/Dashboard"
             }
           },
+          "404": {
+            "description": "Not found. Dashboard with provided id doesn't exist."
+          },
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
@@ -414,18 +420,22 @@
           "properties": {
             "x": {
               "type": "integer",
+              "format": "int32",
               "description": "The dashboard's part x coordinate."
             },
             "y": {
               "type": "integer",
+              "format": "int32",
               "description": "The dashboard's part y coordinate."
             },
             "rowSpan": {
               "type": "integer",
+              "format": "int32",
               "description": "The dashboard's part row span."
             },
             "colSpan": {
               "type": "integer",
+              "format": "int32",
               "description": "The dashboard's part column span."
             },
             "metadata": {
@@ -456,6 +466,7 @@
       "properties": {
         "order": {
           "type": "integer",
+          "format": "int32",
           "description": "The lens order."
         },
         "parts": {
@@ -630,7 +641,8 @@
       "properties": {
         "code": {
           "description": "Service specific error code which serves as the substatus for the HTTP error code.",
-          "type": "string",
+          "type": "integer",
+          "format": "int32",
           "readOnly": true
         },
         "message": {
diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/tenantConfiguration.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/tenantConfiguration.json
index 1895a45a5f2f..0465059bda7d 100644
--- a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/tenantConfiguration.json
+++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/tenantConfiguration.json
@@ -81,6 +81,9 @@
               "$ref": "#/definitions/Configuration"
             }
           },
+          "404": {
+            "description": "Not found. Tenant configuration wasn't created yet."
+          },
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/TenantConfiguration/GetTenantConfiguration.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/TenantConfiguration/GetTenantConfiguration.json
index acdef20dfe34..4617b15396d8 100644
--- a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/TenantConfiguration/GetTenantConfiguration.json
+++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/TenantConfiguration/GetTenantConfiguration.json
@@ -13,6 +13,7 @@
           "enforcePrivateMarkdownStorage": true
         }
       }
-    }
+    },
+    "404": {}
   }
 }
diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/getDashboard.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/getDashboard.json
index 8245989bfe7f..e015271439b1 100644
--- a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/getDashboard.json
+++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/getDashboard.json
@@ -54,6 +54,7 @@
           "anotherKey": "anotherValue"
         }
       }
-    }
+    },
+    "404": {}
   }
 }
diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/updateDashboard.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/updateDashboard.json
index e0c901c6d277..e846feaedb86 100644
--- a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/updateDashboard.json
+++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/updateDashboard.json
@@ -60,6 +60,7 @@
           "anotherKey": "anotherValue2"
         }
       }
-    }
+    },
+    "404": {}
   }
 }
diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/portal.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/portal.json
index 2ebeb8c17ede..0d02b3278e4e 100644
--- a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/portal.json
+++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/portal.json
@@ -213,6 +213,9 @@
               "$ref": "#/definitions/Dashboard"
             }
           },
+          "404": {
+            "description": "Not found. Dashboard with provided id doesn't exist."
+          },
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
@@ -268,6 +271,9 @@
               "$ref": "#/definitions/Dashboard"
             }
           },
+          "404": {
+            "description": "Not found. Dashboard with provided id doesn't exist."
+          },
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {
@@ -414,18 +420,22 @@
           "properties": {
             "x": {
               "type": "integer",
+              "format": "int32",
               "description": "The dashboard's part x coordinate."
             },
             "y": {
               "type": "integer",
+              "format": "int32",
               "description": "The dashboard's part y coordinate."
             },
             "rowSpan": {
               "type": "integer",
+              "format": "int32",
               "description": "The dashboard's part row span."
             },
             "colSpan": {
               "type": "integer",
+              "format": "int32",
               "description": "The dashboard's part column span."
             },
             "metadata": {
@@ -526,6 +536,7 @@
       "properties": {
         "order": {
           "type": "integer",
+          "format": "int32",
           "description": "The lens order."
         },
         "parts": {
@@ -700,7 +711,8 @@
       "properties": {
         "code": {
           "description": "Service specific error code which serves as the substatus for the HTTP error code.",
-          "type": "string",
+          "type": "integer",
+          "format": "int32",
           "readOnly": true
         },
         "message": {
diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/tenantConfiguration.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/tenantConfiguration.json
index 31ea569ca460..1aa0d5dd2f75 100644
--- a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/tenantConfiguration.json
+++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/tenantConfiguration.json
@@ -84,6 +84,9 @@
               "$ref": "#/definitions/Configuration"
             }
           },
+          "404": {
+            "description": "Not found. Tenant configuration wasn't created yet."
+          },
           "default": {
             "description": "Error response describing why the operation failed.",
             "schema": {