diff --git a/README.md b/README.md
index 8204c9366..465fd8547 100644
--- a/README.md
+++ b/README.md
@@ -231,7 +231,7 @@ The following core Node.js modules (v7.7.1) have been implemented:
 | vm                    | The vm module provides APIs for compiling and running code within V8 Virtual Machine contexts.|
 | zlib                  | This provides bindings to Gzip/Gunzip, Deflate/Inflate, and DeflateRaw/InflateRaw classes. |
 
-*NOTE*: The SBT artifact for the complete Node.js platform is: "io.scalajs" %%% "nodejs" % "0.4.0-pre5" 
+*NOTE*: The SBT artifact for the complete Node.js platform is: "io.scalajs" %%% "nodejs" % "0.4.0" 
 
 <a name="npm_modules">
 #### Third-party Modules
@@ -298,7 +298,7 @@ The following Third Party/OSS Node.js (npm) modules have been implemented:
 | [winston-daily-rotate-file](https://github.com/scalajs-io/winston-daily-rotate-file)  | 1.4.4   | A multi-transport async logging library for Node.js. |    
 | [xml2js](https://github.com/scalajs-io/xml2js)                                        | 0.4.16  | Simple XML to JavaScript object converter. |
 
-*NOTE*: The full SBT artifact expression is: "io.scalajs.npm" %%% "xxxx" % version (e.g. "io.scalajs.npm" %%% "express" % "0.4.0-pre5")
+*NOTE*: The full SBT artifact expression is: "io.scalajs.npm" %%% "xxxx" % version (e.g. "io.scalajs.npm" %%% "express" % "0.4.0")
 
 I've provided an example to demonstrate how similar the Scala.js code is to the JavaScript
 that it replaces.
diff --git a/build.sbt b/build.sbt
index 7a3332363..acb3387f4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -5,7 +5,7 @@ import sbt._
 
 import scala.language.postfixOps
 
-val scalaJsIOVersion = "0.4.0-pre5"
+val scalaJsIOVersion = "0.4.0"
 val apiVersion = scalaJsIOVersion
 val scalaJsVersion = "2.12.1"
 
diff --git a/package.json b/package.json
index 232037396..166a4fbe0 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "nodejs-sfs",
-  "version": "0.4.0-pre5",
+  "version": "0.4.0",
   "private": true,
   "dependencies": {
-    "source-map": "^0.5.6"
+    "source-map-support": "^0.4.14"
   }
 }
diff --git a/src/main/scala/io/scalajs/nodejs/child_process/ChildProcess.scala b/src/main/scala/io/scalajs/nodejs/child_process/ChildProcess.scala
index 5be52bf07..3d0adceff 100644
--- a/src/main/scala/io/scalajs/nodejs/child_process/ChildProcess.scala
+++ b/src/main/scala/io/scalajs/nodejs/child_process/ChildProcess.scala
@@ -2,6 +2,7 @@ package io.scalajs.nodejs
 package child_process
 
 import io.scalajs.RawOptions
+import io.scalajs.nodejs.events.IEventEmitter
 import io.scalajs.nodejs.buffer.Buffer
 
 import scala.scalajs.js
@@ -15,7 +16,7 @@ import scala.scalajs.js.|
   * @author lawrence.daniels@gmail.com
   */
 @js.native
-trait ChildProcess extends js.Object {
+trait ChildProcess extends IEventEmitter {
 
   /**
     * Spawns a shell then executes the command within that shell, buffering any generated output.
diff --git a/src/main/scala/io/scalajs/nodejs/http/ClientRequest.scala b/src/main/scala/io/scalajs/nodejs/http/ClientRequest.scala
index 5a934c942..1236a0ddb 100644
--- a/src/main/scala/io/scalajs/nodejs/http/ClientRequest.scala
+++ b/src/main/scala/io/scalajs/nodejs/http/ClientRequest.scala
@@ -8,6 +8,7 @@ import io.scalajs.util.PromiseHelper._
 
 import scala.concurrent.Future
 import scala.scalajs.js
+import scala.scalajs.js.annotation.JSImport
 
 /**
   * http.ClientRequest - This object is created internally and returned from http.request(). It represents an in-progress
@@ -30,6 +31,7 @@ import scala.scalajs.js
   * @author lawrence.daniels@gmail.com
   */
 @js.native
+@JSImport("http", "ClientRequest")
 class ClientRequest extends Readable {
 
   def headers: js.Dictionary[String] = js.native
diff --git a/src/main/scala/io/scalajs/nodejs/os/NetworkInterface.scala b/src/main/scala/io/scalajs/nodejs/os/NetworkInterface.scala
index 1cabb5700..2837fd683 100644
--- a/src/main/scala/io/scalajs/nodejs/os/NetworkInterface.scala
+++ b/src/main/scala/io/scalajs/nodejs/os/NetworkInterface.scala
@@ -1,16 +1,16 @@
 package io.scalajs.nodejs.os
 
 import scala.scalajs.js
+import scala.scalajs.js.annotation.ScalaJSDefined
 
 /**
   * Represents a Network Interface
   * @author lawrence.daniels@gmail.com
   */
-@js.native
+@ScalaJSDefined
 class NetworkInterface(val address: String,
                        val netmask: String,
                        val family: String,
                        val mac: String,
                        val scopeid: js.UndefOr[Int],
-                       val internal: Boolean)
-    extends js.Object
+                       val internal: Boolean) extends js.Object
diff --git a/src/main/scala/io/scalajs/nodejs/querystring/QueryEncodeOptions.scala b/src/main/scala/io/scalajs/nodejs/querystring/QueryEncodeOptions.scala
index 48032a3e1..f0af39164 100644
--- a/src/main/scala/io/scalajs/nodejs/querystring/QueryEncodeOptions.scala
+++ b/src/main/scala/io/scalajs/nodejs/querystring/QueryEncodeOptions.scala
@@ -1,6 +1,7 @@
 package io.scalajs.nodejs.querystring
 
 import scala.scalajs.js
+import scala.scalajs.js.annotation.ScalaJSDefined
 
 /**
   * Query String Encode Options
@@ -8,5 +9,5 @@ import scala.scalajs.js
   *                           the query string. Defaults to querystring.escape().
   * @author lawrence.daniels@gmail.com
   */
-@js.native
+@ScalaJSDefined
 class QueryEncodeOptions(val encodeURIComponent: js.UndefOr[js.Function] = js.undefined) extends js.Object
diff --git a/src/test/resources/watchfile.json b/src/test/resources/watchfile.json
index 71d3fbed1..b06484513 100644
--- a/src/test/resources/watchfile.json
+++ b/src/test/resources/watchfile.json
@@ -1,6 +1,6 @@
 {
   "name": "scalajs-io",
-  "version": "0.4.0-pre5",
+  "version": "0.4.0",
   "private": true,
   "dependencies": {
     "async": "^2.0.1",
@@ -42,7 +42,7 @@
     "rx": "^4.1.0",
     "should": "^11.1.2",
     "socket.io": "^1.7.2",
-    "source-map": "^0.5.6",
+    "source-map-support": "^0.4.14",
     "splitargs": "0.0.7",
     "tingodb": "^0.5.1",
     "transducers-js": "^0.4.174",