diff --git a/css/xterm.css b/css/xterm.css
index 3fab18bd..38e27a00 100644
--- a/css/xterm.css
+++ b/css/xterm.css
@@ -133,7 +133,8 @@
     cursor: default;
 }
 
-.xterm.xterm-cursor-pointer {
+.xterm.xterm-cursor-pointer,
+.xterm .xterm-cursor-pointer {
     cursor: pointer;
 }
 
diff --git a/src/browser/Terminal.ts b/src/browser/Terminal.ts
index 23122f3f..6ab17060 100644
--- a/src/browser/Terminal.ts
+++ b/src/browser/Terminal.ts
@@ -537,7 +537,7 @@ export class Terminal extends CoreTerminal implements ITerminal {
     this.register(this._mouseZoneManager);
     this.register(this.onScroll(() => this._mouseZoneManager!.clearAll()));
     this.linkifier.attachToDom(this.element, this._mouseZoneManager);
-    this.linkifier2.attachToDom(this.element, this._mouseService, this._renderService);
+    this.linkifier2.attachToDom(this.screenElement, this._mouseService, this._renderService);
 
     // This event listener must be registered aftre MouseZoneManager is created
     this.register(addDisposableDomListener(this.element, 'mousedown', (e: MouseEvent) => this._selectionService!.onMouseDown(e)));
diff --git a/typings/xterm.d.ts b/typings/xterm.d.ts
index 18bc0b95..40583628 100644
--- a/typings/xterm.d.ts
+++ b/typings/xterm.d.ts
@@ -1265,12 +1265,12 @@ declare module 'xterm' {
    */
   interface IBufferCellPosition {
     /**
-     * The x position within the buffer.
+     * The x position within the buffer (1-based).
      */
     x: number;
 
     /**
-     * The y position within the buffer.
+     * The y position within the buffer (1-based).
      */
     y: number;
   }