diff --git a/cmake/Modules/Packages/ML-QUIP.cmake b/cmake/Modules/Packages/ML-QUIP.cmake
index 4db1eb1541..56221accab 100644
--- a/cmake/Modules/Packages/ML-QUIP.cmake
+++ b/cmake/Modules/Packages/ML-QUIP.cmake
@@ -43,6 +43,7 @@ if(DOWNLOAD_QUIP)
   file(WRITE ${CMAKE_BINARY_DIR}/quip.config "${temp}")
 
   message(STATUS "QUIP download via git requested - we will build our own")
+  set(CMAKE_EP_GIT_REMOTE_UPDATE_STRATEGY CHECKOUT)
   # QUIP has no releases (except for a tag marking the end of Python 2 support). We use the current "public" branch
   # The LAMMPS interface wrapper has a compatibility constant that is being checked at runtime.
   include(ExternalProject)
diff --git a/doc/utils/sphinx-config/false_positives.txt b/doc/utils/sphinx-config/false_positives.txt
index 667d988433..836dc4efa8 100644
--- a/doc/utils/sphinx-config/false_positives.txt
+++ b/doc/utils/sphinx-config/false_positives.txt
@@ -1569,6 +1569,7 @@ jpeglib
 jpg
 JPG
 jpl
+json
 Jth
 jtranch
 jtype
diff --git a/src/atom_vec.cpp b/src/atom_vec.cpp
index deff0cfd58..dbacf2237a 100644
--- a/src/atom_vec.cpp
+++ b/src/atom_vec.cpp
@@ -207,7 +207,7 @@ void AtomVec::grow(int n)
   if (n == 0)
     grow_nmax();
   else
-    nmax = n;
+    nmax = MAX(n,nmax);
   atom->nmax = nmax;
   if (nmax < 0 || nmax > MAXSMALLINT) error->one(FLERR, "Per-processor system is too big");
 
diff --git a/unittest/force-styles/tests/fix-timestep-oneway.yaml b/unittest/force-styles/tests/fix-timestep-oneway.yaml
index c592517d8e..76a9d4c5a7 100644
--- a/unittest/force-styles/tests/fix-timestep-oneway.yaml
+++ b/unittest/force-styles/tests/fix-timestep-oneway.yaml
@@ -1,7 +1,7 @@
 ---
 lammps_version: 17 Feb 2022
 date_generated: Fri Mar 18 22:17:59 2022
-epsilon: 7.5e-14
+epsilon: 2e-13
 skip_tests:
 prerequisites: ! |
   atom full
diff --git a/unittest/force-styles/tests/mol-pair-lj_cut_tip4p_long.yaml b/unittest/force-styles/tests/mol-pair-lj_cut_tip4p_long.yaml
index 2579a3bf6c..28961cd04e 100644
--- a/unittest/force-styles/tests/mol-pair-lj_cut_tip4p_long.yaml
+++ b/unittest/force-styles/tests/mol-pair-lj_cut_tip4p_long.yaml
@@ -1,7 +1,7 @@
 ---
 lammps_version: 17 Feb 2022
 date_generated: Fri Mar 18 22:17:32 2022
-epsilon: 5e-12
+epsilon: 2e-11
 skip_tests:
 prerequisites: ! |
   atom full