diff --git a/src/networktables/NetworkTable.cpp b/src/networktables/NetworkTable.cpp
index 4f8650ca11..b033000df3 100644
--- a/src/networktables/NetworkTable.cpp
+++ b/src/networktables/NetworkTable.cpp
@@ -35,7 +35,11 @@ void NetworkTable::SetServerMode() { s_client = false; }
 
 void NetworkTable::SetTeam(int team) {
   char tmp[30];
-  sprintf(tmp, "%d.%d.%d.%d\n", 10, team / 100, team % 100, 2);
+#ifdef _MSC_VER
+  sprintf_s(tmp, "%d.%d.%d.%d\n", 10, team / 100, team % 100, 2);
+#else
+  std::snprintf(tmp, 30, "%d.%d.%d.%d\n", 10, team / 100, team % 100, 2);
+#endif
   SetIPAddress(tmp);
 }
 
diff --git a/src/tcpsockets/TCPStream.cpp b/src/tcpsockets/TCPStream.cpp
index b5ca15feb5..2fcee36da3 100644
--- a/src/tcpsockets/TCPStream.cpp
+++ b/src/tcpsockets/TCPStream.cpp
@@ -65,7 +65,11 @@ std::size_t TCPStream::send(const char* buffer, std::size_t len, Error* err) {
   }
   if (!result) {
     char Buffer[128];
-    sprintf(Buffer, "Send() failed: WSA error=%d\n", WSAGetLastError());
+#ifdef _MSC_VER
+    sprintf_s(Buffer, "Send() failed: WSA error=%d\n", WSAGetLastError());
+#else
+    std::snprintf(Buffer, 128, "Send() failed: WSA error=%d\n", WSAGetLastError());
+#endif
     OutputDebugStringA(Buffer);
     *err = kConnectionReset;
     return 0;