diff --git a/src/vs/platform/diagnostics/common/diagnosticsService.ts b/src/vs/platform/diagnostics/common/diagnosticsService.ts
index 496b75397c0..ae854fcfb7c 100644
--- a/src/vs/platform/diagnostics/common/diagnosticsService.ts
+++ b/src/vs/platform/diagnostics/common/diagnosticsService.ts
@@ -8,6 +8,7 @@ import { ProcessItem } from 'vs/base/common/processes';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IMainProcessInfo } from 'vs/platform/launch/common/launchService';
 import { IWorkspace } from 'vs/platform/workspace/common/workspace';
+import { IStringDictionary } from 'vs/base/common/collections';
 
 export interface IMachineInfo {
 	os: string;
@@ -18,7 +19,7 @@ export interface IMachineInfo {
 
 export interface IDiagnosticInfo {
 	machineInfo: IMachineInfo;
-	workspaceMetadata?: { [key: string]: WorkspaceStats };
+	workspaceMetadata?: IStringDictionary<WorkspaceStats>;
 	processes?: ProcessItem;
 }
 export interface SystemInfo extends IMachineInfo {
diff --git a/src/vs/workbench/contrib/markers/browser/markersPanelActions.ts b/src/vs/workbench/contrib/markers/browser/markersPanelActions.ts
index 01d83e82d95..92fd3b3c925 100644
--- a/src/vs/workbench/contrib/markers/browser/markersPanelActions.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersPanelActions.ts
@@ -275,10 +275,11 @@ export class MarkersFilterActionViewItem extends BaseActionViewItem {
 
 	private reportFilteringUsed(): void {
 		const filterOptions = this.filterController.getFilterOptions();
-		const data = {};
-		data['errors'] = filterOptions.filterErrors;
-		data['warnings'] = filterOptions.filterWarnings;
-		data['infos'] = filterOptions.filterInfos;
+		const data = {
+			errors: filterOptions.filterErrors,
+			warnings: filterOptions.filterWarnings,
+			infos: filterOptions.filterInfos,
+		};
 		/* __GDPR__
 			"problems.filter" : {
 				"errors" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
diff --git a/src/vs/workbench/contrib/output/browser/outputPanel.ts b/src/vs/workbench/contrib/output/browser/outputPanel.ts
index 7537b9381b6..09365d68550 100644
--- a/src/vs/workbench/contrib/output/browser/outputPanel.ts
+++ b/src/vs/workbench/contrib/output/browser/outputPanel.ts
@@ -95,7 +95,7 @@ export class OutputPanel extends AbstractTextResourceEditor {
 		options.renderLineHighlight = 'none';
 		options.minimap = { enabled: false };
 
-		const outputConfig = this.baseConfigurationService.getValue<{}>('[Log]');
+		const outputConfig = this.baseConfigurationService.getValue<any>('[Log]');
 		if (outputConfig) {
 			if (outputConfig['editor.minimap.enabled']) {
 				options.minimap = { enabled: true };
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts b/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts
index 6912a5f72a6..8d87975990c 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesEditor.ts
@@ -284,7 +284,7 @@ export class PreferencesEditor extends BaseEditor {
 	}
 
 	private _countById(settingsGroups: ISettingsGroup[]): IStringDictionary<number> {
-		const result = {};
+		const result: IStringDictionary<number> = {};
 
 		for (const group of settingsGroups) {
 			let i = 0;
@@ -680,7 +680,7 @@ class PreferencesRenderersController extends Disposable {
 	}
 
 	private _updatePreference(key: string, value: any, source: ISetting, fromEditableSettings?: boolean): void {
-		const data = {
+		const data: { [key: string]: any } = {
 			userConfigurationKeys: [key]
 		};