diff --git a/p4api.net/p4api.net.core.nuspec b/p4api.net/p4api.net.core.nuspec
index 2eeaea6..116f345 100644
--- a/p4api.net/p4api.net.core.nuspec
+++ b/p4api.net/p4api.net.core.nuspec
@@ -35,7 +35,6 @@
     <file src="..\p4bridge\out\osx-Release\libp4bridge.dylib" target="runtimes\osx-x64\native"/>
     <file src="..\LICENSE.txt" target="" />
     <file src="p4api.net.core.targets" target="build" />
+    <file src="p4api.net.core.targets" target="buildTransitive" />
   </files>
 </package>
-
-
diff --git a/p4api.net/p4api.net.lib.nuspec b/p4api.net/p4api.net.lib.nuspec
index fec0d8b..13448fd 100644
--- a/p4api.net/p4api.net.lib.nuspec
+++ b/p4api.net/p4api.net.lib.nuspec
@@ -35,7 +35,6 @@
     <file src="..\p4bridge\out\osx-Release\libp4bridge.dylib" target="runtimes\osx-x64\native"/>
     <file src="..\LICENSE.txt" target="" />
     <file src="p4api.net.targets" target="build" />
+    <file src="p4api.net.targets" target="buildTransitive" />
   </files>
 </package>
-
-
diff --git a/p4api.net/p4api.net.x64.nuspec b/p4api.net/p4api.net.x64.nuspec
index 3de2cfd..65cd3bd 100644
--- a/p4api.net/p4api.net.x64.nuspec
+++ b/p4api.net/p4api.net.x64.nuspec
@@ -35,7 +35,6 @@
     <file src="..\p4bridge\out\osx-Release\libp4bridge.dylib" target="runtimes\osx-x64\native"/>
     <file src="..\LICENSE.txt" target="" />
     <file src="p4api.net.x64.targets" target="build" />
+    <file src="p4api.net.x64.targets" target="buildTransitive" />
   </files>
 </package>
-
-
diff --git a/p4api.net/p4api.net.x86.nuspec b/p4api.net/p4api.net.x86.nuspec
index abca079..9b4d06d 100644
--- a/p4api.net/p4api.net.x86.nuspec
+++ b/p4api.net/p4api.net.x86.nuspec
@@ -35,7 +35,6 @@
     <file src="..\p4bridge\out\osx-Release\libp4bridge.dylib" target="runtimes\osx-x64\native"/>
     <file src="..\LICENSE.txt" target="" />
     <file src="p4api.net.x86.targets" target="build" />
+    <file src="p4api.net.x86.targets" target="buildTransitive" />
   </files>
 </package>
-
-
diff --git a/p4bridge/CMakeLists.txt b/p4bridge/CMakeLists.txt
index 50e1bfe..5dc8594 100644
--- a/p4bridge/CMakeLists.txt
+++ b/p4bridge/CMakeLists.txt
@@ -22,6 +22,11 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
     string(COMPARE EQUAL "${MSVC_CXX_ARCHITECTURE_ID}" "X86" _is_x86)
     link_directories( "../p4api$<${_is_x86}:_x86>_$<IF:$<CONFIG:Debug>,debug,release>/lib" )
     include_directories( "../p4api$<${_is_x86}:_x86>_$<IF:$<CONFIG:Debug>,debug,release>/include/p4" )
+    if (MSVC AND (MSVC_VERSION GREATER 1900))
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /guard:cf")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /guard:cf")
+        set(CMAKE_MODULE_LINKER_FLAGS  "${CMAKE_MODULE_LINKER_FLAGS} /guard:cf /DYNAMICBASE")
+    endif()
 endif()
 
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
@@ -44,7 +49,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
     find_library(Foundation_lib Foundation )
     find_library(CoreServices_lib CoreServices )
     find_library(CoreGraphics_lib CoreGraphics )
-	find_library(Security_lib Security )
+    find_library(Security_lib Security )
     set(PlatformLibs ${Foundation_lib} ${CoreServices_lib} ${CoreGraphics_lib} ${Security_lib})
     link_directories( "../p4api/lib" )
     include_directories("../p4api/include/p4")