diff --git a/examples/index_remove.js b/examples/index_remove.js
index 6b16fb3e..0f4f36fc 100644
--- a/examples/index_remove.js
+++ b/examples/index_remove.js
@@ -174,7 +174,7 @@ function run(client) {
             !argv.quiet && console.log("OK.");
         }
     });
-});
+};
 
 
 function isError(err) {
@@ -198,4 +198,4 @@ aerospike.client(config).connect(function(err, client) {
     } else {
         run(client)
     }
-});
\ No newline at end of file
+});
diff --git a/examples/info.js b/examples/info.js
index c73969f7..b7055dc3 100644
--- a/examples/info.js
+++ b/examples/info.js
@@ -102,7 +102,7 @@ var request = argv._.length !== 0 ? argv._.shift() : "statistics";
 
 if (argv.help === true) {
     argp.showHelp();
-    return;
+    process.exit(0);
 }
 
 iteration.setLimit(argv.iterations);
diff --git a/examples/info_host.js b/examples/info_host.js
index eaa45b2b..6b31eac5 100644
--- a/examples/info_host.js
+++ b/examples/info_host.js
@@ -102,7 +102,7 @@ var request = argv._.length !== 0 ? argv._.shift() : "statistics";
 
 if (argv.help === true) {
     argp.showHelp();
-    return;
+    process.exit(0);
 }
 
 iteration.setLimit(argv.iterations);
@@ -177,4 +177,4 @@ aerospike.client(config).connect(function(err, client) {
     } else {
         run(client)
     }
-});
\ No newline at end of file
+});
diff --git a/examples/llist.js b/examples/llist.js
index bdeb2ae2..5c98ec21 100644
--- a/examples/llist.js
+++ b/examples/llist.js
@@ -94,7 +94,7 @@ var argv = argp.argv;
 
 if (argv.help === true) {
     argp.showHelp();
-    return;
+    process.exit(0);
 }
 
 /*******************************************************************************
@@ -250,4 +250,4 @@ client.connect(function(err, client) {
 
 
 
-});
\ No newline at end of file
+});
diff --git a/examples/logging.js b/examples/logging.js
index 2e6926a6..7ac31f97 100644
--- a/examples/logging.js
+++ b/examples/logging.js
@@ -98,14 +98,14 @@ var logfile = argv._.length === 1 ? argv._[0] : null;
 
 if (argv.help === true) {
     argp.showHelp();
-    return;
+    process.exit(0);
 }
 
 if (logfile === null) {
     console.error("Error: Please provide a logfile for the operation");
     console.error();
     argp.showHelp();
-    return;
+    process.exit(1);
 }
 
 
@@ -249,4 +249,4 @@ operations = [
 
 operations.reduceRight(function(r, l) {
     return l(r);
-})();
\ No newline at end of file
+})();
diff --git a/examples/query_aggregate.js b/examples/query_aggregate.js
index 59d68b5f..cbd8ff8d 100644
--- a/examples/query_aggregate.js
+++ b/examples/query_aggregate.js
@@ -104,7 +104,7 @@ var argv = argp.argv;
 
 if (argv.help === true) {
     argp.showHelp();
-    return;
+    process.exit(0);
 }
 
 iteration.setLimit(argv.iterations);
@@ -193,4 +193,4 @@ aerospike.client(config).connect(function(err, client) {
     } else {
         run(client)
     }
-});
\ No newline at end of file
+});
diff --git a/examples/query_geospatial.js b/examples/query_geospatial.js
index db9e0bb3..be703bd6 100644
--- a/examples/query_geospatial.js
+++ b/examples/query_geospatial.js
@@ -95,7 +95,7 @@ var argv = argp.argv;
 
 if ( argv.help === true ) {
 	argp.showHelp();
-	return;
+	process.exit(0);
 }
 
 /*******************************************************************************
diff --git a/examples/scan.js b/examples/scan.js
index a625c11e..aa421430 100644
--- a/examples/scan.js
+++ b/examples/scan.js
@@ -150,7 +150,7 @@ function run(client) {
 
     var options = {
         nobins: false,
-        concurrent: true,
+        concurrent: true
     };
 
     var stream = client.query(argv.namespace, argv.set, options).execute();
@@ -184,4 +184,4 @@ aerospike.client(config).connect(function(err, client) {
     } else {
         run(client);
     }
-});
\ No newline at end of file
+});
diff --git a/src/main/client/query.cc b/src/main/client/query.cc
index 95641410..c85ab6f9 100644
--- a/src/main/client/query.cc
+++ b/src/main/client/query.cc
@@ -195,7 +195,7 @@ void ParseWhereClause(as_query* query, Local<Object> filter, LogInfo* log)
     }
 }
 
-void ParseRecordQSize( int* q_size, Local<Object> qSize, LogInfo* log)
+void ParseRecordQSize( int* q_size, Local<Value> qSize, LogInfo* log)
 {
     //Set the queue size here.
     //This is the temporary queue where objects returned by query callback is stored.
@@ -238,7 +238,7 @@ void ParseUDFArgs(QueryScan* queryScan, Local<Object> udf, LogInfo* log, bool is
 }
 
 
-void ParseScanPriority(as_scan* scan, Local<Object> obj, LogInfo* log)
+void ParseScanPriority(as_scan* scan, Local<Value> obj, LogInfo* log)
 {
     //Nan::HandleScope scope;
     //Set the scan_priority of the scan.
@@ -255,7 +255,7 @@ void ParseScanPriority(as_scan* scan, Local<Object> obj, LogInfo* log)
     }
 }
 
-void ParseScanPercent(as_scan* scan, Local<Object> obj, LogInfo* log)
+void ParseScanPercent(as_scan* scan, Local<Value> obj, LogInfo* log)
 {
     Nan::HandleScope scope;
     //Set the percentage to be scanned in each partition.
@@ -372,7 +372,7 @@ void ParseConfig( AerospikeQuery* query, Local<Object> config)
     }
 
     if( config->Has(Nan::New("recordQSize").ToLocalChecked())) {
-        ParseRecordQSize(&query->q_size, config->Get(Nan::New("recordQSize").ToLocalChecked())->ToObject(), log);
+        ParseRecordQSize(&query->q_size, config->Get(Nan::New("recordQSize").ToLocalChecked()), log);
     }
 
     if( config->Has(Nan::New("aggregationUDF").ToLocalChecked())) {
@@ -393,10 +393,10 @@ void ParseConfig( AerospikeQuery* query, Local<Object> config)
     if( query->type == SCAN || query->type == SCANUDF) {
         as_scan* scan = query->query_scan.scan;
         if(config->Has(Nan::New("priority").ToLocalChecked())) {
-            ParseScanPriority(scan, config->Get(Nan::New("priority").ToLocalChecked())->ToObject(), log);
+            ParseScanPriority(scan, config->Get(Nan::New("priority").ToLocalChecked()), log);
         }
         if(config->Has(Nan::New("percent").ToLocalChecked())) {
-            ParseScanPercent(scan, config->Get(Nan::New("percent").ToLocalChecked())->ToObject(), log);
+            ParseScanPercent(scan, config->Get(Nan::New("percent").ToLocalChecked()), log);
         }
         if(config->Has(Nan::New("nobins").ToLocalChecked())) {
             ParseScanNobins(scan, config->Get(Nan::New("nobins").ToLocalChecked()), log);