diff --git a/src/browser/Terminal.ts b/src/browser/Terminal.ts
index 5aed701a..004f2314 100644
--- a/src/browser/Terminal.ts
+++ b/src/browser/Terminal.ts
@@ -113,8 +113,8 @@ export class Terminal extends CoreTerminal implements ITerminal {
   public get onSelectionChange(): IEvent<void> { return this._onSelectionChange.event; }
   private _onTitleChange = new EventEmitter<string>();
   public get onTitleChange(): IEvent<string> { return this._onTitleChange.event; }
-  private _onBell  = new EventEmitter<void>();
-  public get onBell (): IEvent<void> { return this._onBell.event; }
+  private _onBell = new EventEmitter<void>();
+  public get onBell(): IEvent<void> { return this._onBell.event; }
 
   private _onFocus = new EventEmitter<void>();
   public get onFocus(): IEvent<void> { return this._onFocus.event; }
diff --git a/src/headless/Terminal.ts b/src/headless/Terminal.ts
index 4011adb9..7f138ce1 100644
--- a/src/headless/Terminal.ts
+++ b/src/headless/Terminal.ts
@@ -32,9 +32,8 @@ export class Terminal extends CoreTerminal {
   // TODO: We should remove options once components adopt optionsService
   public get options(): IInitializedTerminalOptions { return this.optionsService.options; }
 
-
-  private _onBell  = new EventEmitter<void>();
-  public get onBell (): IEvent<void> { return this._onBell.event; }
+  private _onBell = new EventEmitter<void>();
+  public get onBell(): IEvent<void> { return this._onBell.event; }
   private _onCursorMove = new EventEmitter<void>();
   public get onCursorMove(): IEvent<void> { return this._onCursorMove.event; }
   private _onTitleChange = new EventEmitter<string>();
@@ -88,6 +87,17 @@ export class Terminal extends CoreTerminal {
     return this.buffers.active;
   }
 
+  protected _updateOptions(key: string): void {
+    super._updateOptions(key);
+
+    // TODO: These listeners should be owned by individual components
+    switch (key) {
+      case 'tabStopWidth': this.buffers.setupTabStops(); break;
+    }
+  }
+
+  // TODO: Support paste here?
+
   public get markers(): IMarker[] {
     return this.buffer.markers;
   }