diff --git a/lib/launcher.js b/lib/launcher.js
index 5832361b7..a8b5aa2c0 100644
--- a/lib/launcher.js
+++ b/lib/launcher.js
@@ -5,11 +5,11 @@
 'use strict';
 
 var ConfigParser = require('./configParser').ConfigParser,
-    TaskScheduler = require('./taskScheduler').default,
+    TaskScheduler = require('./taskScheduler').TaskScheduler,
     helper = require('./util'),
     log = require('./logger'),
     q = require('q'),
-    TaskRunner = require('./taskRunner').default;
+    TaskRunner = require('./taskRunner').TaskRunner;
 
 var logPrefix = '[launcher]';
 var RUNNERS_FAILED_EXIT_CODE = 100;
diff --git a/lib/plugins.js b/lib/plugins.js
index 9e4c13d16..59623cbaa 100644
--- a/lib/plugins.js
+++ b/lib/plugins.js
@@ -1,6 +1,6 @@
 var webdriver = require('selenium-webdriver'),
     q = require('q'),
-    ConfigParser = require('./configParser').default,
+    ConfigParser = require('./configParser').ConfigParser,
     log = require('./logger');
 
 var PROMISE_TYPE = {
diff --git a/lib/taskLogger.ts b/lib/taskLogger.ts
index b1e0b06af..813bd8829 100644
--- a/lib/taskLogger.ts
+++ b/lib/taskLogger.ts
@@ -1,7 +1,7 @@
-import {EOL} from 'os';
+import * as os from 'os';
 import * as Logger from './logger';
 
-export default class TaskLogger {
+export class TaskLogger {
   private buffer: string = '';
   private insertTag: boolean = true;
 
@@ -22,9 +22,9 @@ export default class TaskLogger {
    * @private
    */
   private logHeader_(): void {
-    let output = 'PID: ' + this.pid + EOL;
+    let output = 'PID: ' + this.pid + os.EOL;
     if (this.task.specs.length === 1) {
-      output += 'Specs: ' + this.task.specs.toString() + EOL + EOL;
+      output += 'Specs: ' + this.task.specs.toString() + os.EOL + os.EOL;
     }
     this.log(output);
   }
@@ -35,9 +35,9 @@ export default class TaskLogger {
   public flush(): void {
     if (this.buffer) {
       // Flush buffer if nonempty
-      Logger.print(EOL + '------------------------------------' + EOL);
+      Logger.print(os.EOL + '------------------------------------' + os.EOL);
       Logger.print(this.buffer);
-      Logger.print(EOL);
+      Logger.print(os.EOL);
       this.buffer = '';
     }
   }
diff --git a/lib/taskRunner.ts b/lib/taskRunner.ts
index 1db925c7d..76c7906a2 100644
--- a/lib/taskRunner.ts
+++ b/lib/taskRunner.ts
@@ -1,11 +1,10 @@
-import {fork} from 'child_process';
+import * as child_process from 'child_process';
 import {EventEmitter} from 'events';
-import {defer, Promise} from 'q';
-import {inherits} from 'util';
+import * as q from 'q';
 
 import {ConfigParser, Config} from './configParser';
 import * as Logger from './logger';
-import TaskLogger from './taskLogger';
+import {TaskLogger} from './taskLogger';
 
 export interface RunResults {
   taskId: number;
@@ -16,7 +15,7 @@ export interface RunResults {
   specResults: Array<any>;
 }
 
-export default class TaskRunner extends EventEmitter {
+export class TaskRunner extends EventEmitter {
   /**
    * A runner for running a specified task (capabilities + specs).
    * The TaskRunner can either run the task from the current process (via
@@ -42,7 +41,7 @@ export default class TaskRunner extends EventEmitter {
    *     result of the run:
    *       taskId, specs, capabilities, failedCount, exitCode, specResults
    */
-  public run(): Promise<any> {
+  public run(): q.Promise<any> {
     let runResults: RunResults = {
       taskId: this.task.taskId,
       specs: this.task.specs,
@@ -54,9 +53,9 @@ export default class TaskRunner extends EventEmitter {
     };
 
     if (this.runInFork) {
-      let deferred = defer();
+      let deferred = q.defer();
 
-      let childProcess = fork(
+      let childProcess = child_process.fork(
           __dirname + '/runnerCli.js', process.argv.slice(2),
           {cwd: process.cwd(), silent: true});
       let taskLogger = new TaskLogger(this.task, childProcess.pid);
diff --git a/lib/taskScheduler.ts b/lib/taskScheduler.ts
index d25dec255..ed0072a4e 100644
--- a/lib/taskScheduler.ts
+++ b/lib/taskScheduler.ts
@@ -1,6 +1,5 @@
 import {ConfigParser, Config} from './configParser';
 
-
 export interface Task {
   capabilities: any;
   specs: Array<string>;
@@ -23,7 +22,7 @@ export class TaskQueue {
   }
 }
 
-export default class TaskScheduler {
+export class TaskScheduler {
   taskQueues: Array<TaskQueue>;
   rotationIndex: number;
 
diff --git a/spec/unit/taskScheduler_test.js b/spec/unit/taskScheduler_test.js
index 138b59941..8bc19a053 100644
--- a/spec/unit/taskScheduler_test.js
+++ b/spec/unit/taskScheduler_test.js
@@ -1,5 +1,5 @@
-var TaskScheduler = require('../../built/taskScheduler').default;
-var ConfigParser = require('../../built/configParser').default;
+var TaskScheduler = require('../../built/taskScheduler').TaskScheduler;
+var ConfigParser = require('../../built/configParser').ConfigParser;
 
 describe('the task scheduler', function() {