diff --git a/packages/grafana-data/src/types/dataLink.ts b/packages/grafana-data/src/types/dataLink.ts
index b17137e46a6..e27a65d0644 100644
--- a/packages/grafana-data/src/types/dataLink.ts
+++ b/packages/grafana-data/src/types/dataLink.ts
@@ -6,7 +6,7 @@ import { DataQuery } from './datasource';
  */
 export interface DataLinkClickEvent<T = any> {
   origin: T;
-  scopedVars: ScopedVars;
+  scopedVars?: ScopedVars;
   e?: any; // mouse|react event
 }
 
diff --git a/public/app/features/panel/panellinks/link_srv.ts b/public/app/features/panel/panellinks/link_srv.ts
index 7e9d0881d2e..ea4125275b2 100644
--- a/public/app/features/panel/panellinks/link_srv.ts
+++ b/public/app/features/panel/panellinks/link_srv.ts
@@ -283,7 +283,7 @@ export class LinkSrv implements LinkService {
   /**
    * Returns LinkModel which is basically a DataLink with all values interpolated through the templateSrv.
    */
-  getDataLinkUIModel = <T>(link: DataLink, scopedVars: ScopedVars, origin: T): LinkModel<T> => {
+  getDataLinkUIModel = <T>(link: DataLink, scopedVars: ScopedVars | undefined, origin: T): LinkModel<T> => {
     const params: KeyValue = {};
     const timeRangeUrl = urlUtil.toUrlParams(this.timeSrv.timeRangeForUrl());
 
diff --git a/public/app/plugins/panel/table-old/editor.ts b/public/app/plugins/panel/table-old/editor.ts
index 2b6edb2abe5..c7c9a9a14ee 100644
--- a/public/app/plugins/panel/table-old/editor.ts
+++ b/public/app/plugins/panel/table-old/editor.ts
@@ -9,8 +9,8 @@ export class TablePanelEditorCtrl {
   fontSizes: any;
   addColumnSegment: any;
   getColumnNames: any;
-  canSetColumns: boolean;
-  columnsHelpMessage: string;
+  canSetColumns = false;
+  columnsHelpMessage = '';
 
   /** @ngInject */
   constructor($scope: any, private uiSegmentSrv: any) {
diff --git a/public/app/plugins/panel/table-old/specs/renderer.test.ts b/public/app/plugins/panel/table-old/specs/renderer.test.ts
index 1cc83b1cae2..370bf0c0a5c 100644
--- a/public/app/plugins/panel/table-old/specs/renderer.test.ts
+++ b/public/app/plugins/panel/table-old/specs/renderer.test.ts
@@ -477,7 +477,7 @@ describe('when rendering table with different patterns', () => {
 });
 
 describe('when rendering cells with different alignment options', () => {
-  const cases = [
+  const cases: Array<[string, boolean, string | null, string]> = [
     //align, preserve fmt, color mode, expected
     ['', false, null, '<td>42</td>'],
     ['invalid_option', false, null, '<td>42</td>'],
diff --git a/public/test/mocks/datasource_srv.ts b/public/test/mocks/datasource_srv.ts
index 3f3b8527563..6491490aa0e 100644
--- a/public/test/mocks/datasource_srv.ts
+++ b/public/test/mocks/datasource_srv.ts
@@ -25,7 +25,6 @@ export class DatasourceSrvMock {
 
 export class MockDataSourceApi extends DataSourceApi {
   result: DataQueryResponse = { data: [] };
-  queryResolver: Promise<DataQueryResponse>;
 
   constructor(name?: string, result?: DataQueryResponse, meta?: any, private error: string | null = null) {
     super({ name: name ? name : 'MockDataSourceApi' } as DataSourceInstanceSettings);
@@ -37,10 +36,6 @@ export class MockDataSourceApi extends DataSourceApi {
   }
 
   query(request: DataQueryRequest): Promise<DataQueryResponse> {
-    if (this.queryResolver) {
-      return this.queryResolver;
-    }
-
     if (this.error) {
       return Promise.reject(this.error);
     }