diff --git a/package.json b/package.json
index 8d42b53c..a269bcd8 100644
--- a/package.json
+++ b/package.json
@@ -131,10 +131,6 @@
             "info",
             "verbose"
           ]
-        },
-        "arduino.clangFormatStyle": {
-          "type": "string",
-          "desription": "The clang-format style value. Set this value to file if want to use the .clang-format file"
         }
       }
     },
@@ -172,6 +168,9 @@
     "postinstall": "node ./node_modules/vscode/bin/install && cd ./html && npm install",
     "test": "node ./node_modules/vscode/bin/test"
   },
+  "extensionDependencies": [
+    "ms-vscode.cpptools"
+  ],
   "devDependencies": {
     "@types/mocha": "^2.2.32",
     "@types/node": "^6.0.40",
diff --git a/src/extension.ts b/src/extension.ts
index 51a5de56..1990ff67 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -42,13 +42,13 @@ export async function activate(context: vscode.ExtensionContext) {
     context.subscriptions.push(vscode.workspace.registerTextDocumentContentProvider(ARDUINO_MANAGER_PROTOCOL, arduinoManagerProvider));
 
     let registerCommand = (command: string, commandBody: (...args: any[]) => any, getUserData?: () => any): vscode.Disposable => {
-        return vscode.commands.registerCommand(command, async () => {
+        return vscode.commands.registerCommand(command, async (...args: any[]) => {
             let guid = Uuid.create().value;
             Logger.traceUserData(`start-command-` + command, { correlationId: guid });
             let timer1 = new Logger.Timer();
             let telemetryResult;
             try {
-                let result = commandBody();
+                let result = commandBody(...args);
                 if (result) {
                     result = await Promise.resolve(result);
                 }
diff --git a/src/serialmonitor/serialMonitor.ts b/src/serialmonitor/serialMonitor.ts
index 43b594c6..89484c73 100644
--- a/src/serialmonitor/serialMonitor.ts
+++ b/src/serialmonitor/serialMonitor.ts
@@ -132,7 +132,7 @@ export class SerialMonitor {
             }
             await this._serialPortCtrl.stop();
             this.updatePortStatus(false);
-        } else {
+        } else if (!port) {
             Logger.notifyUserWarning("closeSerialMonitorError", new Error(constants.messages.SERIAL_PORT_NOT_STARTED));
         }
     }