diff --git a/ADVANCED_README.md b/ADVANCED_README.md
index b16a624d..6cfd4e42 100644
--- a/ADVANCED_README.md
+++ b/ADVANCED_README.md
@@ -766,7 +766,7 @@ $ pm2 delete processes.js[on]
 
 The following are valid options for JSON app declarations:
 
-```json
+```js
 {
   "name"             : "node-app",
   "cwd"              : "/srv/node-app/current",
@@ -1421,8 +1421,8 @@ Every data, states, websocket session, session data, must be shared via any kind
 
 We recommend using Redis for sharing session data, websocket.
 
-- SocketIO with Redis : [https://github.com/LearnBoost/Socket.IO/wiki/Configuring-Socket.IO](Configuring SocketIO)
-- Redis session store for Connect : [https://github.com/visionmedia/connect-redis](Connect-redis)
+- [Configuring SocketIO](https://github.com/LearnBoost/Socket.IO/wiki/Configuring-Socket.IO)
+- [Redis session store for Connect](https://github.com/visionmedia/connect-redis)
 
 We recommend following the 12 factor convention : [http://12factor.net/](http://12factor.net/)
 
diff --git a/bin/pm2 b/bin/pm2
index deeb7443..48b65b12 100755
--- a/bin/pm2
+++ b/bin/pm2
@@ -434,7 +434,7 @@ commander.command('link [secret_key|command] [public_key] [machine_name]')
 // Web interface
 //
 commander.command('web')
-  .description('launch an health API on port ' + cst.WEB_INTERFACE)
+  .description('launch a health API on port ' + cst.WEB_INTERFACE)
   .action(function() {
     console.log('Launching web interface on port ' + cst.WEB_INTERFACE);
     CLI.web();
diff --git a/constants.js b/constants.js
index 872c40f5..96bc5438 100644
--- a/constants.js
+++ b/constants.js
@@ -13,7 +13,7 @@ var PM2_ROOT_PATH = '';
 if (process.env.PM2_HOME)
   PM2_ROOT_PATH = process.env.PM2_HOME;
 else if (process.env.HOME || process.env.HOMEPATH)
-  PM2_ROOT_PATH = p.resolve(process.env.HOME || process.env.HOMEPATH, '.pm2');
+  PM2_ROOT_PATH = p.resolve(process.env.HOME || (process.env.HOMEDRIVE + process.env.HOMEPATH), '.pm2');
 else
   PM2_ROOT_PATH = p.resolve('/etc', '.pm2');