diff --git a/.gitignore b/.gitignore
index a29fe374..a7493d6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ build/
 out/
 npm-debug.log
 node_modules/
+
 # generated by scripts/configure.js
 options.gypi
-.project
-addon.node
diff --git a/Makefile b/Makefile
index 7eb85b2b..44fab19e 100644
--- a/Makefile
+++ b/Makefile
@@ -39,8 +39,7 @@ plugin: configure
 	node scripts/cleanup.js
 
 .PHONY: addon
-addon:
-	node scripts/configure.js
+addon: configure
 	node-gyp rebuild
 
 .PHONY: _travis
@@ -50,6 +49,14 @@ _travis:
 	LLNODE_DEBUG=true \
 	npm test
 
+# `configure` is run during preinstall.
+# This is run by `npm install`.
+.PHONY: npm-build
+npm-build:
+	./gyp_llnode
+	$(MAKE) -C out/
+	node-gyp rebuild
+
 .PHONY: clean
 clean:
 	$(RM) -r out
diff --git a/binding.gyp b/binding.gyp
index 4872ceb7..2e1ec4a8 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -13,6 +13,7 @@
 
   "targets": [{
     "target_name": "addon",
+    "type": "loadable_module",
     "sources": [
       "src/addon.cc",
       "src/llnode_module.cc",
@@ -26,8 +27,12 @@
       "<(lldb_dir)/include",
       "<!(node -e \"require('nan')\")"
     ],
+    "cflags" : [ "-std=c++11" ],
     "conditions": [
       [ "OS == 'mac'", {
+        "xcode_settings": {
+          "OTHER_CPLUSPLUSFLAGS" : [ "-std=c++11", "-stdlib=libc++" ],
+        },
         "conditions": [
           [ "lldb_build_dir == ''", {
             "variables": {
@@ -36,8 +41,8 @@
             "xcode_settings": {
               "OTHER_LDFLAGS": [
                 "-F<(mac_shared_frameworks)",
-              "-Wl,-rpath,<(mac_shared_frameworks)",
-              "-framework LLDB",
+                "-Wl,-rpath,<(mac_shared_frameworks)",
+                "-framework LLDB",
               ],
             },
           },
diff --git a/package.json b/package.json
index 00227518..84bc8d03 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   "//": "(Blame C++)",
   "scripts": {
     "preinstall": "node scripts/configure.js",
-    "install": "./gyp_llnode && ( gmake -C out/ || make -C out/ )",
+    "install": "( gmake npm-build || make npm-build )",
     "postinstall": "node scripts/cleanup.js",
     "test": "tape test/*-test.js"
   },
@@ -22,6 +22,7 @@
   },
   "files": [
     "Makefile",
+    "binding.gyp",
     "llnode.gyp.json",
     "gyp_llnode",
     "common.gypi",
diff --git a/scripts/configure.js b/scripts/configure.js
index 7bed29f6..7526ed1c 100644
--- a/scripts/configure.js
+++ b/scripts/configure.js
@@ -340,7 +340,7 @@ function getLinuxLib(version) {
   console.log('Checking for shared libraries, version is ' + version);
   try {
     const libDir = child_process.execFileSync('llvm-config-' + version,
-      ['--libdir']).toString().trim();
+        ['--libdir']).toString().trim();
     const soPath = path.join(libDir, `liblldb-${version}.so`);
     const stat = fs.lstatSync(soPath);
     if (stat.isFile() || stat.isSymbolicLink()) {
@@ -353,7 +353,7 @@ function getLinuxLib(version) {
     console.log(err);
     // Return undefined, we will download the headers.
   }
-  // On Redhat lib are just installed in /usr/lib
+  // On Redhat libs are just installed in /usr/lib
   if (fs.existsSync('/usr/lib/lldblldb.so')) {
     return {
       buildDir: '/usr',