diff --git a/src/SelectionManager.ts b/src/SelectionManager.ts
index 1a8d6b6c..138e861d 100644
--- a/src/SelectionManager.ts
+++ b/src/SelectionManager.ts
@@ -6,7 +6,7 @@
 import { ITerminal, ISelectionManager, ISelectionRedrawRequestEvent } from './Types';
 import { IBuffer } from 'common/buffer/Types';
 import { IBufferLine } from 'common/Types';
-import { MouseHelper } from './browser/input/MouseHelper';
+import { MouseHelper } from 'browser/input/MouseHelper';
 import * as Browser from 'common/Platform';
 import { SelectionModel } from './SelectionModel';
 import { AltClickHandler } from './handlers/AltClickHandler';
diff --git a/src/Terminal.ts b/src/Terminal.ts
index 35b97bf1..087fb379 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -35,7 +35,7 @@ import { SelectionManager } from './SelectionManager';
 import * as Browser from 'common/Platform';
 import { addDisposableDomListener } from 'browser/Lifecycle';
 import * as Strings from './Strings';
-import { MouseHelper } from './browser/input/MouseHelper';
+import { MouseHelper } from 'browser/input/MouseHelper';
 import { SoundManager } from './SoundManager';
 import { MouseZoneManager } from './MouseZoneManager';
 import { AccessibilityManager } from './AccessibilityManager';
@@ -54,7 +54,7 @@ import { OptionsService } from 'common/services/OptionsService';
 import { ICharSizeService } from 'browser/services/Services';
 import { CharSizeService } from 'browser/services/CharSizeService';
 import { BufferService, MINIMUM_COLS, MINIMUM_ROWS } from 'common/services/BufferService';
-import { IBufferSet, IBuffer } from '../out/common/buffer/Types';
+import { IBufferSet, IBuffer } from 'common/buffer/Types';
 
 // Let it work inside Node.js for automated testing purposes.
 const document = (typeof window !== 'undefined') ? window.document : null;
@@ -224,14 +224,11 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
   ) {
     super();
 
-    // Initialize common services
+    // Setup and initialize common services
     this.optionsService = new OptionsService(options);
-    this._bufferService = new BufferService(this.optionsService);
-
     this._setupOptionsListeners();
-
-    // this.options = clone(options);
     this._setup();
+    this._bufferService = new BufferService(this.optionsService);
 
     // TODO: Remove these in v4
     // Fire old style events from new emitters
diff --git a/src/common/TestUtils.test.ts b/src/common/TestUtils.test.ts
index 358fdb17..2d699cf8 100644
--- a/src/common/TestUtils.test.ts
+++ b/src/common/TestUtils.test.ts
@@ -7,7 +7,7 @@ import { IBufferService, IOptionsService, ITerminalOptions, IPartialTerminalOpti
 import { IEvent, EventEmitter2 } from 'common/EventEmitter2';
 import { clone } from 'common/Clone';
 import { DEFAULT_OPTIONS } from 'common/services/OptionsService';
-import { IBufferSet, IBuffer } from './buffer/Types';
+import { IBufferSet, IBuffer } from 'common/buffer/Types';
 
 export class MockBufferService implements IBufferService {
   public buffer: IBuffer = {} as any;