diff --git a/src/njs/src/njsOracle.cpp b/src/njs/src/njsOracle.cpp
index 5cdc551b..9f095722 100644
--- a/src/njs/src/njsOracle.cpp
+++ b/src/njs/src/njsOracle.cpp
@@ -23,6 +23,8 @@
  *
  *****************************************************************************/
 
+#include "node.h"
+
 #include "njsOracle.h"
 #include "njsConnection.h"
 #include "njsPool.h"
@@ -53,6 +55,7 @@ Oracledb::Oracledb()
   poolMin_       = POOL_MIN;
   poolIncrement_ = POOL_INCR;
   poolTimeout_   = POOL_TIMEOUT;
+  connClass_     = "";
 } 
 
 /*****************************************************************************/
diff --git a/src/njs/src/njsOracle.h b/src/njs/src/njsOracle.h
index 552238b9..4df8d342 100644
--- a/src/njs/src/njsOracle.h
+++ b/src/njs/src/njsOracle.h
@@ -79,7 +79,7 @@ private:
    // Create Pool Methods
    static Handle<Value>  CreatePool (const Arguments& args);
    static void Async_CreatePool (uv_work_t *req );
-   static void Async_AfterCreatePool (uv_work_t *req );
+   static void Async_AfterCreatePool (uv_work_t *req);
    
    // Define Getter Accessors to Properties
    static Handle<Value> GetPoolMin(Local<String> property,
diff --git a/src/njs/src/njsPool.cpp b/src/njs/src/njsPool.cpp
index bfc032c5..9855ca51 100644
--- a/src/njs/src/njsPool.cpp
+++ b/src/njs/src/njsPool.cpp
@@ -23,6 +23,10 @@
  *
  *****************************************************************************/
 
+#include "node.h"
+
+#include <string>
+
 #include "njsOracle.h"
 #include "njsPool.h"
 #include "njsConnection.h"
@@ -504,11 +508,12 @@ void Pool::Async_GetConnection(uv_work_t *req)
   
    PARAMETERS:
      UV queue work block 
+     status - expected to be non-zero.
 
    NOTES:
      Connection handle is formed and handed over to JS.
 */
-Handle<Value> Pool::Async_AfterGetConnection(uv_work_t *req)
+void Pool::Async_AfterGetConnection(uv_work_t *req)
 {
   HandleScope scope;
   connectionBaton *connBaton = (connectionBaton*)req->data;
@@ -536,7 +541,6 @@ Handle<Value> Pool::Async_AfterGetConnection(uv_work_t *req)
     node::FatalException(tc);
   }
   delete connBaton;
-  return Undefined();
 }
 
 /*****************************************************************************/
diff --git a/src/njs/src/njsPool.h b/src/njs/src/njsPool.h
index d4ee3fc2..d0a99f48 100644
--- a/src/njs/src/njsPool.h
+++ b/src/njs/src/njsPool.h
@@ -53,7 +53,7 @@ private:
    // Get Connection Methods 
    static Handle<Value> GetConnection(const Arguments& args);
    static void Async_GetConnection(uv_work_t* req);
-   static Handle<Value> Async_AfterGetConnection(uv_work_t* req);
+   static void Async_AfterGetConnection(uv_work_t* req);
    
   // Terminate Methods
    static Handle<Value> Terminate(const Arguments& args);