diff --git a/shared/config.gradle b/shared/config.gradle
index 055af89838..fe50f192d6 100644
--- a/shared/config.gradle
+++ b/shared/config.gradle
@@ -1,7 +1,7 @@
 import edu.wpi.first.nativeutils.*
 import org.gradle.internal.os.OperatingSystem
 
-def windowsCompilerArgs = ['/EHsc', '/D_CRT_SECURE_NO_WARNINGS', '/Zi', '/FS', '/Zc:inline', '/MP4', '/W3', '/wd4244', '/wd4267', '/wd4146', '/std:c++17', '/permissive-', '/WX']
+def windowsCompilerArgs = ['/EHsc', '/D_CRT_SECURE_NO_WARNINGS', '/Zi', '/FS', '/Zc:inline', '/W3', '/wd4244', '/wd4267', '/wd4146', '/wd4996', '/std:c++17', '/Zc:throwingNew', '/permissive-', '/WX']
 def windowsCCompilerArgs = ['/Zi', '/FS', '/Zc:inline', '/W3', '/WX']
 def windowsReleaseCompilerArgs = ['/O2', '/MD']
 def windowsDebugCompilerArgs = ['/Od', '/MDd']
diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt
index bc09c1c3f6..bcb8d7c76a 100644
--- a/wpiutil/CMakeLists.txt
+++ b/wpiutil/CMakeLists.txt
@@ -78,9 +78,12 @@ set_target_properties(wpiutil PROPERTIES DEBUG_POSTFIX "d")
 set_property(TARGET wpiutil PROPERTY FOLDER "libraries")
 
 if (NOT MSVC)
-    target_compile_options(wpiutil PUBLIC -std=c++14 -Wall -pedantic -Wextra -Wno-unused-parameter)
+    target_compile_options(wpiutil PUBLIC $<BUILD_INTERFACE:-Wall -pedantic -Wextra -Werror -Wno-unused-parameter>)
+    target_compile_features(wpiutil PUBLIC cxx_std_14)
 else()
-    target_compile_options(wpiutil PUBLIC /wd4244 /wd4267 /wd4146 /WX /permissive- /std:c++17)
+    target_compile_options(wpiutil PUBLIC /wd4244 /wd4267 /wd4146)
+    target_compile_options(wpiutil PUBLIC $<BUILD_INTERFACE:/WX /wd4996 /permissive- /Zc:throwingNew>)
+    target_compile_features(wpiutil PUBLIC cxx_std_17)
     target_compile_options(wpiutil PRIVATE -D_CRT_SECURE_NO_WARNINGS)
 endif()