diff --git a/coreconf/config.gypi b/coreconf/config.gypi
index e33cdfaa3f..2f17c822de 100644
--- a/coreconf/config.gypi
+++ b/coreconf/config.gypi
@@ -150,11 +150,6 @@
           'NSS_NO_INIT_SUPPORT',
         ],
       }],
-      [ 'static_libs==1', {
-        'variables': {
-          'standalone_static_library': '1',
-        },
-      }],
       [ 'OS!="android" and OS!="mac" and OS!="ios" and OS!="win"', {
         'libraries': [
           '-lpthread',
@@ -231,7 +226,7 @@
         'product_dir': '<(nss_dist_obj_dir)/lib'
       }, '_type=="executable"', {
         'product_dir': '<(nss_dist_obj_dir)/bin'
-      }, '_standalone_static_library==1', {
+      }, 'static_libs==1 or _standalone_static_library==1', {
         'product_dir': '<(nss_dist_obj_dir)/lib'
       }],
       # mapfile handling
@@ -322,6 +317,9 @@
           },
         },
       }],
+      [ '_type=="static_library" and static_libs==1', {
+        'standalone_static_library': 1,
+      }],
     ],
     'default_configuration': 'Debug',
     'configurations': {
diff --git a/gtests/common/gtest.gypi b/gtests/common/gtest.gypi
index c4865bba51..919c23aa31 100644
--- a/gtests/common/gtest.gypi
+++ b/gtests/common/gtest.gypi
@@ -21,6 +21,13 @@
         'libraries': [
           '-lws2_32',
         ],
+        'conditions': [
+          ['static_libs==1', {
+            'libraries': [
+              '-ladvapi32',
+            ],
+          }],
+        ],
       }],
       ['OS=="android"', {
         'libraries': [
diff --git a/gtests/common/gtests.cc b/gtests/common/gtests.cc
index 7e585791b8..d0f21ee04f 100644
--- a/gtests/common/gtests.cc
+++ b/gtests/common/gtests.cc
@@ -1,6 +1,5 @@
 #include "nspr.h"
 #include "nss.h"
-#include "ssl.h"
 
 #include <cstdlib>
 
@@ -29,9 +28,6 @@ int main(int argc, char **argv) {
   if (NSS_Initialize(workdir, "", "", SECMOD_DB, flags) != SECSuccess) {
     return 1;
   }
-  if (NSS_SetDomesticPolicy() != SECSuccess) {
-    return 1;
-  }
   int rv = RUN_ALL_TESTS();
 
   if (NSS_Shutdown() != SECSuccess) {
diff --git a/lib/freebl/freebl_base.gypi b/lib/freebl/freebl_base.gypi
index 76df714972..84f16d682b 100644
--- a/lib/freebl/freebl_base.gypi
+++ b/lib/freebl/freebl_base.gypi
@@ -99,7 +99,7 @@
     }],
     [ 'OS=="win"', {
       'libraries': [
-        'advapi32.lib',
+        '-ladvapi32',
       ],
       'conditions': [
         [ 'cc_use_gnu_ld!=1 and target_arch=="x64"', {