diff --git a/Project.njsproj b/Project.njsproj
index 5291291ee..08765995d 100644
--- a/Project.njsproj
+++ b/Project.njsproj
@@ -20,8 +20,9 @@
     <OutputPath>.</OutputPath>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <ProjectTypeGuids>{3AF33F2E-1136-4D97-BBB7-1795711AC8B8};{349c5851-65df-11da-9384-00065b846f21};{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}</ProjectTypeGuids>
-    <NodejsPort>1337</NodejsPort>
-    <StartWebBrowser>true</StartWebBrowser>
+    <NodejsPort>
+    </NodejsPort>
+    <StartWebBrowser>False</StartWebBrowser>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/server.js b/server.js
index 1e46f56af..923618401 100644
--- a/server.js
+++ b/server.js
@@ -33,7 +33,7 @@ global.CUSTOM_FAIL_RESPONSE = {
 }
 
 let http = require('http')
-let port = process.env.PORT || 1337
+let port = process.env.VIRTUAL_PORT || 1337
 let isHttpServerStarted = false
 let cloneExecutorChildProcess