diff --git a/samples/server/petstore/nodejs-google-cloud-functions/api/swagger.yaml b/samples/server/petstore/nodejs-google-cloud-functions/api/swagger.yaml
index a2b8cd0f5cc..ced8e85705b 100644
--- a/samples/server/petstore/nodejs-google-cloud-functions/api/swagger.yaml
+++ b/samples/server/petstore/nodejs-google-cloud-functions/api/swagger.yaml
@@ -108,11 +108,11 @@ paths:
         type: "array"
         items:
           type: "string"
+          default: "available"
           enum:
           - "available"
           - "pending"
           - "sold"
-          default: "available"
         collectionFormat: "csv"
       responses:
         200:
diff --git a/samples/server/petstore/nodejs/api/swagger.yaml b/samples/server/petstore/nodejs/api/swagger.yaml
index a2b8cd0f5cc..ced8e85705b 100644
--- a/samples/server/petstore/nodejs/api/swagger.yaml
+++ b/samples/server/petstore/nodejs/api/swagger.yaml
@@ -108,11 +108,11 @@ paths:
         type: "array"
         items:
           type: "string"
+          default: "available"
           enum:
           - "available"
           - "pending"
           - "sold"
-          default: "available"
         collectionFormat: "csv"
       responses:
         200:
diff --git a/samples/server/petstore/nodejs/index.js b/samples/server/petstore/nodejs/index.js
index aaa873a128a..2310e7b2fd8 100644
--- a/samples/server/petstore/nodejs/index.js
+++ b/samples/server/petstore/nodejs/index.js
@@ -1,25 +1,28 @@
 'use strict';
 
+var fs = require('fs'),
+    path = require('path'),
+    http = require('http');
+
 var app = require('connect')();
-var http = require('http');
 var swaggerTools = require('swagger-tools');
 var jsyaml = require('js-yaml');
-var fs = require('fs');
 var serverPort = 8080;
 
 // swaggerRouter configuration
 var options = {
-  swaggerUi: '/swagger.json',
-  controllers: './controllers',
-  useStubs: process.env.NODE_ENV === 'development' ? true : false // Conditionally turn on stubs (mock mode)
+  swaggerUi: path.join(__dirname, '/swagger.json'),
+  controllers: path.join(__dirname, './controllers'),
+  useStubs: process.env.NODE_ENV === 'development' // Conditionally turn on stubs (mock mode)
 };
 
 // The Swagger document (require it, build it programmatically, fetch it from a URL, ...)
-var spec = fs.readFileSync('./api/swagger.yaml', 'utf8');
+var spec = fs.readFileSync(path.join(__dirname,'api/swagger.yaml'), 'utf8');
 var swaggerDoc = jsyaml.safeLoad(spec);
 
 // Initialize the Swagger middleware
 swaggerTools.initializeMiddleware(swaggerDoc, function (middleware) {
+
   // Interpret Swagger resources and attach metadata to request - must be first in swagger-tools middleware chain
   app.use(middleware.swaggerMetadata());
 
@@ -37,4 +40,5 @@ swaggerTools.initializeMiddleware(swaggerDoc, function (middleware) {
     console.log('Your server is listening on port %d (http://localhost:%d)', serverPort, serverPort);
     console.log('Swagger-ui is available on http://localhost:%d/docs', serverPort);
   });
+
 });