diff --git a/.eslintrc b/.eslintrc
index 007d3298cc..2782382c7d 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -18,7 +18,8 @@
     "new-cap": 0,
     "no-loop-func": 0,
     "no-unreachable": 0,
-    "no-labels": 0
+    "no-labels": 0,
+    "no-process-exit": 0
   },
   "env": {
     "node": true
diff --git a/Makefile b/Makefile
index fe417d6a8e..00782e93d6 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ clean-core:
 	rm -rf lib
 
 lint:
-	eslint src/babel
+	eslint src/babel packages/babel-cli/bin
 
 build:
 	mkdir -p dist
diff --git a/packages/babel-cli/bin/babel-plugin/index.js b/packages/babel-cli/bin/babel-plugin/index.js
index 2185470340..d02d5695d0 100755
--- a/packages/babel-cli/bin/babel-plugin/index.js
+++ b/packages/babel-cli/bin/babel-plugin/index.js
@@ -35,7 +35,7 @@ function spawnMultiple(cmds) {
 }
 
 function template(name, data) {
-  var source = fs.readFileSync(__dirname + "/templates/" + name, "utf8");
+  var source = fs.readFileSync(path.join(__dirname, "templates", name), "utf8");
   source = source.replace(/[A-Z_]+/g, function (key) {
     return data[key] === undefined ? key : data[key];
   });
diff --git a/packages/babel-cli/bin/babel/dir.js b/packages/babel-cli/bin/babel/dir.js
index 45f11501d7..4858679b6a 100644
--- a/packages/babel-cli/bin/babel/dir.js
+++ b/packages/babel-cli/bin/babel/dir.js
@@ -7,7 +7,7 @@ var util           = require("./util");
 var fs             = require("fs");
 var _              = require("lodash");
 
-module.exports = function (commander, filenames, opts) {
+module.exports = function (commander, filenames) {
   var write = function (src, relative) {
     // remove extension and then append back on .js
     relative = relative.replace(/\.(\w*?)$/, "") + ".js";
diff --git a/packages/babel-cli/bin/babel/index.js b/packages/babel-cli/bin/babel/index.js
index ff8fb31d10..8e89cbce1c 100755
--- a/packages/babel-cli/bin/babel/index.js
+++ b/packages/babel-cli/bin/babel/index.js
@@ -10,7 +10,6 @@ var util             = require("babel-core").util;
 var uniq             = require("lodash/array/uniq");
 var each             = require("lodash/collection/each");
 var keys             = require("lodash/object/keys");
-var fs               = require("fs");
 var glob             = require("glob");
 
 each(options, function (option, key) {