diff --git a/src/Explorer/Controls/ThroughputInput/CostEstimateText/CostEstimateText.tsx b/src/Explorer/Controls/ThroughputInput/CostEstimateText/CostEstimateText.tsx
index 51aaae619..5f897de83 100644
--- a/src/Explorer/Controls/ThroughputInput/CostEstimateText/CostEstimateText.tsx
+++ b/src/Explorer/Controls/ThroughputInput/CostEstimateText/CostEstimateText.tsx
@@ -28,8 +28,9 @@ export const CostEstimateText: FunctionComponent<CostEstimateTextProps> = ({
   }
 
   const serverId: string = userContext.portalEnv;
+  const { enableMultipleWriteLocations } = databaseAccount.properties;
   const numberOfRegions: number = databaseAccount.properties.readLocations?.length || 1;
-  const multimasterEnabled: boolean = databaseAccount.properties.enableMultipleWriteLocations;
+  const multimasterEnabled: boolean = enableMultipleWriteLocations ? enableMultipleWriteLocations : false;
   const hourlyPrice: number = computeRUUsagePriceHourly({
     serverId,
     requestUnits,
diff --git a/src/Explorer/Notebook/NotebookRenderer/decorators/draggable/index.tsx b/src/Explorer/Notebook/NotebookRenderer/decorators/draggable/index.tsx
index 8c190cf95..bc8b59118 100644
--- a/src/Explorer/Notebook/NotebookRenderer/decorators/draggable/index.tsx
+++ b/src/Explorer/Notebook/NotebookRenderer/decorators/draggable/index.tsx
@@ -11,7 +11,6 @@ import {
   DropTargetConnector,
   DropTargetMonitor,
 } from "react-dnd";
-
 import { connect } from "react-redux";
 import { Dispatch } from "redux";
 import styled, { StyledComponent } from "styled-components";
@@ -109,7 +108,7 @@ const DragHandleAnchor = styled.div`
   position: relative;
 `;
 
-export function isDragUpper(props: Props, monitor: DropTargetMonitor, el: HTMLElement): boolean {
+export function isDragUpper(_props: Props, monitor: DropTargetMonitor, el: HTMLElement): boolean {
   const hoverBoundingRect = el.getBoundingClientRect();
   const hoverMiddleY = (hoverBoundingRect.bottom - hoverBoundingRect.top) / 2;
 
@@ -223,7 +222,7 @@ export class DraggableCellView extends React.Component<Props & DnDSourceProps &
 const source = DragSource<Props, DnDSourceProps>("CELL", cellSource, collectSource);
 const target = DropTarget<Props, DnDTargetProps>("CELL", cellTarget, collectTarget);
 
-export const makeMapDispatchToProps = (initialDispatch: Dispatch) => {
+export const makeMapDispatchToProps = (_initialDispatch: Dispatch) => {
   const mapDispatchToProps = (dispatch: Dispatch) => ({
     moveCell: (payload: actions.MoveCell["payload"]) => dispatch(actions.moveCell(payload)),
     focusCell: (payload: actions.FocusCell["payload"]) => dispatch(actions.focusCell(payload)),
diff --git a/src/Platform/Hosted/Helpers/ResourceTokenUtils.test.ts b/src/Platform/Hosted/Helpers/ResourceTokenUtils.test.ts
index 61ceb206b..e4fff804b 100644
--- a/src/Platform/Hosted/Helpers/ResourceTokenUtils.test.ts
+++ b/src/Platform/Hosted/Helpers/ResourceTokenUtils.test.ts
@@ -10,7 +10,7 @@ describe("parseResourceTokenConnectionString", () => {
       accountEndpoint: "fakeEndpoint",
       collectionId: "fakeCollectionId",
       databaseId: "fakeDatabaseId",
-      partitionKey: undefined,
+      partitionKey: "",
       resourceToken: "type=resource&ver=1&sig=2dIP+CdIfT1ScwHWdv5GGw==;fakeToken;",
     });
   });
diff --git a/src/Platform/Hosted/Helpers/ResourceTokenUtils.ts b/src/Platform/Hosted/Helpers/ResourceTokenUtils.ts
index b55014c23..d58c67500 100644
--- a/src/Platform/Hosted/Helpers/ResourceTokenUtils.ts
+++ b/src/Platform/Hosted/Helpers/ResourceTokenUtils.ts
@@ -7,11 +7,11 @@ export interface ParsedResourceTokenConnectionString {
 }
 
 export function parseResourceTokenConnectionString(connectionString: string): ParsedResourceTokenConnectionString {
-  let accountEndpoint: string;
-  let collectionId: string;
-  let databaseId: string;
-  let partitionKey: string;
-  let resourceToken: string;
+  let accountEndpoint = "";
+  let collectionId = "";
+  let databaseId = "";
+  let partitionKey = "";
+  let resourceToken = "";
   const connectionStringParts = connectionString.split(";");
   connectionStringParts.forEach((part: string) => {
     if (part.startsWith("type=resource")) {
@@ -39,5 +39,5 @@ export function parseResourceTokenConnectionString(connectionString: string): Pa
 }
 
 export function isResourceTokenConnectionString(connectionString: string): boolean {
-  return connectionString && connectionString.includes("type=resource");
+  return connectionString.includes("type=resource");
 }
diff --git a/src/UserContext.ts b/src/UserContext.ts
index 0cbec9226..826b42ba4 100644
--- a/src/UserContext.ts
+++ b/src/UserContext.ts
@@ -21,7 +21,7 @@ interface UserContext {
   // This is coming in a future Cosmos ARM API version as a prperty on databaseAccount
   apiType: ApiType;
   readonly isTryCosmosDBSubscription?: boolean;
-  readonly portalEnv?: PortalEnv;
+  readonly portalEnv: PortalEnv;
   readonly features: Features;
   readonly addCollectionFlight: string;
   readonly hasWriteAccess: boolean;
diff --git a/tsconfig.strict.json b/tsconfig.strict.json
index 7a8971ce1..74055d070 100644
--- a/tsconfig.strict.json
+++ b/tsconfig.strict.json
@@ -8,9 +8,11 @@
     "noUnusedParameters": true
   },
   "files": [
+    "./src/Explorer/Controls/ThroughputInput/CostEstimateText/CostEstimateText.tsx",
     "./src/AuthType.ts",
     "./src/Bindings/ReactBindingHandler.ts",
     "./src/Common/ArrayHashMap.ts",
+    "./src/Common/CollapsedResourceTree.tsx",
     "./src/Common/Constants.ts",
     "./src/Common/DeleteFeedback.ts",
     "./src/Common/DocumentUtility.ts",
@@ -25,6 +27,7 @@
     "./src/Common/ObjectCache.ts",
     "./src/Common/OfferUtility.test.ts",
     "./src/Common/OfferUtility.ts",
+    "./src/Common/ResourceTree.tsx",
     "./src/Common/Splitter.ts",
     "./src/Common/ThemeUtility.ts",
     "./src/Common/UrlUtility.ts",
@@ -46,6 +49,7 @@
     "./src/Explorer/LazyMonaco.ts",
     "./src/Explorer/Notebook/FileSystemUtil.ts",
     "./src/Explorer/Notebook/NTeractUtil.ts",
+    "./src/Explorer/Notebook/NotebookComponent/ContentProviders/InMemoryContentProviderUtils.ts",
     "./src/Explorer/Notebook/NotebookComponent/actions.ts",
     "./src/Explorer/Notebook/NotebookComponent/loadTransform.ts",
     "./src/Explorer/Notebook/NotebookComponent/reducers.ts",
@@ -57,7 +61,10 @@
     "./src/Explorer/Notebook/NotebookRenderer/PromptContent.tsx",
     "./src/Explorer/Notebook/NotebookRenderer/decorators/CellCreator.tsx",
     "./src/Explorer/Notebook/NotebookRenderer/decorators/CellLabeler.tsx",
+    "./src/Explorer/Notebook/NotebookRenderer/decorators/draggable/index.tsx",
     "./src/Explorer/Notebook/NotebookUtil.ts",
+    "./src/Explorer/Notebook/SchemaAnalyzer/SchemaAnalyzerSplashScreen.tsx",
+    "./src/Explorer/Notebook/SchemaAnalyzer/SchemaAnalyzerUtils.ts",
     "./src/Explorer/OpenFullScreen.test.tsx",
     "./src/Explorer/OpenFullScreen.tsx",
     "./src/Explorer/Panes/PaneComponents.ts",
@@ -78,9 +85,13 @@
     "./src/Index.ts",
     "./src/NotebookWorkspaceManager/NotebookWorkspaceResourceProviderMockClients.ts",
     "./src/Platform/Hosted/Authorization.ts",
+    "./src/Platform/Hosted/Components/ConnectExplorer.test.tsx",
+    "./src/Platform/Hosted/Components/ConnectExplorer.tsx",
     "./src/Platform/Hosted/Components/MeControl.test.tsx",
     "./src/Platform/Hosted/Components/MeControl.tsx",
     "./src/Platform/Hosted/Components/SignInButton.tsx",
+    "./src/Platform/Hosted/Helpers/ResourceTokenUtils.test.ts",
+    "./src/Platform/Hosted/Helpers/ResourceTokenUtils.ts",
     "./src/Platform/Hosted/extractFeatures.test.ts",
     "./src/Platform/Hosted/extractFeatures.ts",
     "./src/ReactDevTools.ts",
@@ -139,4 +150,4 @@
     "src/Terminal/**/*",
     "src/Utils/arm/**/*"
   ]
-}
+}
\ No newline at end of file