diff --git a/cmake/modules/FindLIBSSH.cmake b/cmake/modules/FindLIBSSH.cmake
index 1c09818770..ba2d778381 100644
--- a/cmake/modules/FindLIBSSH.cmake
+++ b/cmake/modules/FindLIBSSH.cmake
@@ -110,7 +110,7 @@ else()
     set(LIBSSH_LIBRARIES ${LIBSSH_LIBRARY} ${LIBSSH_THREADS_LIBRARY})
     mark_as_advanced(LIBSSH_INCLUDE_DIRS LIBSSH_LIBRARIES)
 
-    find_package_handle_standard_args(LibSSH FOUND_VAR LIBSSH_FOUND
+    find_package_handle_standard_args(LIBSSH FOUND_VAR LIBSSH_FOUND
         REQUIRED_VARS LIBSSH_INCLUDE_DIRS LIBSSH_LIBRARIES
         VERSION_VAR LIBSSH_VERSION)
 endif()
diff --git a/cmake/toolchains/gnu.toolchain.cmake b/cmake/toolchains/gnu.toolchain.cmake
index 95156a5ad5..b21dad213d 100644
--- a/cmake/toolchains/gnu.toolchain.cmake
+++ b/cmake/toolchains/gnu.toolchain.cmake
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.3.0)
 
 # load settings in case of "try compile"
 set(TOOLCHAIN_CONFIG_FILE "${WPILIB_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/toolchain.config.cmake")
diff --git a/googletest/CMakeLists.txt.in b/googletest/CMakeLists.txt.in
index 196b3b6d11..f162039234 100644
--- a/googletest/CMakeLists.txt.in
+++ b/googletest/CMakeLists.txt.in
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.2)
+cmake_minimum_required(VERSION 3.3.0)
 
 project(googletest-download NONE)
 
diff --git a/imgui/CMakeLists.txt.in b/imgui/CMakeLists.txt.in
index 1e3cde4bd1..ee8e2a22a7 100644
--- a/imgui/CMakeLists.txt.in
+++ b/imgui/CMakeLists.txt.in
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.2)
+cmake_minimum_required(VERSION 3.3.0)
 
 project(imgui-download NONE)
 
diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt
index 1c0063df21..49990bad9b 100644
--- a/wpiutil/CMakeLists.txt
+++ b/wpiutil/CMakeLists.txt
@@ -76,10 +76,12 @@ endif()
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
-if (NOT MSVC AND NOT APPLE)
+if (NOT MSVC AND NOT APPLE AND NOT ANDROID)
     find_library(ATOMIC NAMES atomic libatomic.so.1)
     if (ATOMIC)
         message(STATUS "Found libatomic: ${ATOMIC}")
+    else()
+        message(STATUS "libatomic not found. If build fails, install libatomic")
     endif()
 endif()
 
@@ -147,7 +149,12 @@ if (MSVC)
     target_compile_definitions(wpiutil PRIVATE -D_CRT_SECURE_NO_WARNINGS)
 endif()
 wpilib_target_warnings(wpiutil)
-target_link_libraries(wpiutil Threads::Threads ${CMAKE_DL_LIBS} ${ATOMIC})
+target_link_libraries(wpiutil Threads::Threads ${CMAKE_DL_LIBS})
+
+if (ATOMIC)
+    target_link_libraries(wpiutil ${ATOMIC})
+endif()
+
 
 if (NOT USE_VCPKG_FMTLIB)
     target_sources(wpiutil PRIVATE ${fmtlib_native_src})