diff --git a/fcs/build.cmd b/fcs/build.cmd
index 163dd456347..f7242b03912 100644
--- a/fcs/build.cmd
+++ b/fcs/build.cmd
@@ -1,4 +1,6 @@
 @echo off
+
+dotnet --version
 .nuget\NuGet.exe restore -PackagesDirectory packages
 setlocal
 cd fcs
diff --git a/fcs/build.sh b/fcs/build.sh
index f0107dfdafe..d6559cfaa8b 100644
--- a/fcs/build.sh
+++ b/fcs/build.sh
@@ -4,6 +4,8 @@ then
   # use .Net
   cmd fcs/build.cmd $@ 
 else
+  dotnet --version
+
   mono .nuget/NuGet.exe restore -PackagesDirectory packages
 
   cd fcs
diff --git a/netci.groovy b/netci.groovy
index 653514e3c0c..7eb435f0595 100644
--- a/netci.groovy
+++ b/netci.groovy
@@ -12,10 +12,14 @@ def static getBuildJobName(def configuration, def os) {
 
 [true, false].each { isPullRequest ->
     osList.each { os ->
-        def configurations = ['Debug', 'Release_ci_part1', 'Release_ci_part2', 'Release_ci_part3', 'Release_net40_no_vs', 'Release_fcs' ];
-        if (os != 'Windows_NT') {
-            // Only build one configuration on Linux/... so far
-            configurations = ['Release'];
+        def configurations = [];
+        if (os == 'Windows_NT') {
+        }
+            configurations = ['Debug', 'Release_ci_part1', 'Release_ci_part2', 'Release_ci_part3', 'Release_net40_no_vs', 'Release_fcs' ];
+        else
+        {
+            // Linux
+            configurations = ['Release', 'Release_fcs' ];
         }
         configurations.each { configuration ->
 
@@ -35,12 +39,8 @@ def static getBuildJobName(def configuration, def os) {
             def buildFlavor= '';
 
             if (configuration == "Release_fcs") {
-                if (os == 'Windows_NT') {
-                    buildPath = ".\\fcs\\"
-                }
-                else {
-                    buildPath = "./fcs/"
-                }
+                // Build FCS
+                buildPath = "./fcs/"
                 buildFlavor = ""
                 build_args = "TestAndNuget"
             }