diff --git a/src/Explorer/Panes/AddCollectionPanel.tsx b/src/Explorer/Panes/AddCollectionPanel.tsx
index ffbea654a..89eae59fb 100644
--- a/src/Explorer/Panes/AddCollectionPanel.tsx
+++ b/src/Explorer/Panes/AddCollectionPanel.tsx
@@ -525,7 +525,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
               }}
             >
               <Stack className="panelGroupSpacing" id="collapsibleSectionContent">
-                {userContext.databaseAccount.properties.capabilities.find((c) => c.name === "EnableMongo") && (
+                {userContext.databaseAccount.properties?.capabilities?.find((c) => c.name === "EnableMongo") && (
                   <Stack className="panelGroupSpacing">
                     <Stack horizontal>
                       <span className="mandatoryStar">*&nbsp;</span>
@@ -851,7 +851,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
       return true;
     }
 
-    return properties.capabilities.some(
+    return properties.capabilities?.some(
       (capability) => capability.name === Constants.CapabilityNames.EnableStorageAnalytics
     );
   }
diff --git a/src/Explorer/Tables/TableEntityProcessor.ts b/src/Explorer/Tables/TableEntityProcessor.ts
index f26d2c38d..c18f7bab9 100644
--- a/src/Explorer/Tables/TableEntityProcessor.ts
+++ b/src/Explorer/Tables/TableEntityProcessor.ts
@@ -183,12 +183,14 @@ export function convertEntityToNewDocument(entity: Entities.ITableEntityForTable
           parsedValue = DateTimeUtilities.convertJSDateToTicksWithPadding(propertyValue);
           break;
         case Constants.TableType.Boolean:
-          parsedValue = propertyValue.toLowerCase() === "true";
+          parsedValue = propertyValue.toString().toLowerCase() === "true";
           break;
         case Constants.TableType.Int32:
-        case Constants.TableType.Int64:
           parsedValue = parseInt(propertyValue, 10);
           break;
+        case Constants.TableType.Int64:
+          parsedValue = propertyValue.toString();
+          break;
         case Constants.TableType.Double:
           parsedValue = parseFloat(propertyValue);
           break;