diff --git a/fixtures/typings-test/typings-test.ts b/fixtures/typings-test/typings-test.ts
index df79d2d0..928ca238 100644
--- a/fixtures/typings-test/typings-test.ts
+++ b/fixtures/typings-test/typings-test.ts
@@ -217,9 +217,10 @@ namespace methods_experimental {
       validationCallback: (uri: string, callback: (isValid: boolean) => void) => {
         console.log(uri, callback);
       },
-      hoverCallback: (e: MouseEvent, uri: string) => {
+      tooltipCallback: (e: MouseEvent, uri: string) => {
         console.log(e, uri);
-      }
+      },
+      leaveCallback: () => {}
     });
     t.deregisterLinkMatcher(1);
   }
diff --git a/src/Linkifier.test.ts b/src/Linkifier.test.ts
index 17793fca..df9e459c 100644
--- a/src/Linkifier.test.ts
+++ b/src/Linkifier.test.ts
@@ -4,7 +4,7 @@
  */
 
 import { assert } from 'chai';
-import { ITerminal, ILinkifier, IBuffer, IBufferAccessor } from './Interfaces';
+import { ITerminal, ILinkifier, IBuffer, IBufferAccessor, IElementAccessor } from './Interfaces';
 import { Linkifier } from './Linkifier';
 import { LinkMatcher, LineData } from './Types';
 import { IMouseZoneManager, IMouseZone } from './input/Interfaces';
@@ -12,13 +12,13 @@ import { MockBuffer } from './utils/TestUtils.test';
 import { CircularList } from './utils/CircularList';
 
 class TestLinkifier extends Linkifier {
-  constructor(private _bufferAccessor: IBufferAccessor) {
-    super(_bufferAccessor);
+  constructor(_terminal: IBufferAccessor & IElementAccessor) {
+    super(_terminal);
     Linkifier.TIME_BEFORE_LINKIFY = 0;
   }
 
   public get linkMatchers(): LinkMatcher[] { return this._linkMatchers; }
-  public linkifyRows(): void { super.linkifyRows(0, this._bufferAccessor.buffer.lines.length - 1); }
+  public linkifyRows(): void { super.linkifyRows(0, this._terminal.buffer.lines.length - 1); }
 }
 
 class TestMouseZoneManager implements IMouseZoneManager {
@@ -33,15 +33,18 @@ class TestMouseZoneManager implements IMouseZoneManager {
 }
 
 describe('Linkifier', () => {
-  let bufferAccessor: IBufferAccessor;
+  let terminal: IBufferAccessor & IElementAccessor;
   let linkifier: TestLinkifier;
   let mouseZoneManager: TestMouseZoneManager;
 
   beforeEach(() => {
-    bufferAccessor = { buffer: new MockBuffer() };
-    bufferAccessor.buffer.lines = new CircularList<LineData>(20);
-    bufferAccessor.buffer.ydisp = 0;
-    linkifier = new TestLinkifier(bufferAccessor);
+    terminal = {
+      buffer: new MockBuffer(),
+      element: <HTMLElement>{}
+    };
+    terminal.buffer.lines = new CircularList<LineData>(20);
+    terminal.buffer.ydisp = 0;
+    linkifier = new TestLinkifier(terminal);
     mouseZoneManager = new TestMouseZoneManager();
   });
 
@@ -54,7 +57,7 @@ describe('Linkifier', () => {
   }
 
   function addRow(text: string): void {
-    bufferAccessor.buffer.lines.push(stringToRow(text));
+    terminal.buffer.lines.push(stringToRow(text));
   }
 
   function assertLinkifiesEntireRow(uri: string, done: MochaDone): void {
@@ -63,7 +66,7 @@ describe('Linkifier', () => {
     setTimeout(() => {
       assert.equal(mouseZoneManager.zones[0].x1, 1);
       assert.equal(mouseZoneManager.zones[0].x2, uri.length + 1);
-      assert.equal(mouseZoneManager.zones[0].y, bufferAccessor.buffer.lines.length);
+      assert.equal(mouseZoneManager.zones[0].y, terminal.buffer.lines.length);
       done();
     }, 0);
   }
@@ -78,7 +81,7 @@ describe('Linkifier', () => {
       links.forEach((l, i) => {
         assert.equal(mouseZoneManager.zones[i].x1, l.x + 1);
         assert.equal(mouseZoneManager.zones[i].x2, l.x + l.length + 1);
-        assert.equal(mouseZoneManager.zones[i].y, bufferAccessor.buffer.lines.length);
+        assert.equal(mouseZoneManager.zones[i].y, terminal.buffer.lines.length);
       });
       done();
     }, 0);
diff --git a/src/Linkifier.ts b/src/Linkifier.ts
index d3839cb5..94795429 100644
--- a/src/Linkifier.ts
+++ b/src/Linkifier.ts
@@ -51,7 +51,7 @@ export class Linkifier extends EventEmitter implements ILinkifier {
   private _nextLinkMatcherId = HYPERTEXT_LINK_MATCHER_ID;
 
   constructor(
-    private _terminal: IBufferAccessor & IElementAccessor
+    protected _terminal: IBufferAccessor & IElementAccessor
   ) {
     super();
     this.registerLinkMatcher(strictUrlRegex, null, { matchIndex: 1 });