diff --git a/public/app/angular/GrafanaCtrl.ts b/public/app/angular/GrafanaCtrl.ts
index cb6a144c224..0ea1b4698a8 100644
--- a/public/app/angular/GrafanaCtrl.ts
+++ b/public/app/angular/GrafanaCtrl.ts
@@ -1,5 +1,5 @@
 import { IRootScopeService, IAngularEvent, auto } from 'angular';
-import $ from 'jquery';
+import 'jquery';
 import _ from 'lodash'; // eslint-disable-line lodash/import-scope
 
 import { AppEvent } from '@grafana/data';
diff --git a/public/app/angular/metric_segment.ts b/public/app/angular/metric_segment.ts
index c4e38e787cb..0020846f3be 100644
--- a/public/app/angular/metric_segment.ts
+++ b/public/app/angular/metric_segment.ts
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+import 'jquery';
 import { debounce, find, indexOf, map, escape, unescape } from 'lodash';
 
 import { TemplateSrv } from 'app/features/templating/template_srv';
diff --git a/public/app/angular/rebuild_on_change.ts b/public/app/angular/rebuild_on_change.ts
index 850d3f7667e..58e4ff4d39a 100644
--- a/public/app/angular/rebuild_on_change.ts
+++ b/public/app/angular/rebuild_on_change.ts
@@ -1,4 +1,4 @@
-import $ from 'jquery';
+import 'jquery';
 
 import coreModule from './core_module';
 
diff --git a/public/app/angular/tags.ts b/public/app/angular/tags.ts
index f5c840500e9..d24acb6cdb3 100644
--- a/public/app/angular/tags.ts
+++ b/public/app/angular/tags.ts
@@ -1,5 +1,5 @@
 import angular from 'angular';
-import $ from 'jquery';
+import 'jquery';
 
 import { getTagColorsFromName } from '@grafana/ui';
 
diff --git a/public/app/features/plugins/loader/sharedDependencies.ts b/public/app/features/plugins/loader/sharedDependencies.ts
index 7059274c717..a24bb582fbe 100644
--- a/public/app/features/plugins/loader/sharedDependencies.ts
+++ b/public/app/features/plugins/loader/sharedDependencies.ts
@@ -26,7 +26,7 @@ import * as ticks from 'app/core/utils/ticks';
 // Help the 6.4 to 6.5 migration
 // The base classes were moved from @grafana/ui to @grafana/data
 // This exposes the same classes on both import paths
-const grafanaUI: Record<string, unknown> = grafanaUIraw;
+const grafanaUI: System.Module = { ...grafanaUIraw };
 grafanaUI.PanelPlugin = grafanaData.PanelPlugin;
 grafanaUI.DataSourcePlugin = grafanaData.DataSourcePlugin;
 grafanaUI.AppPlugin = grafanaData.AppPlugin;