diff --git a/contrib/pyln-client/requirements.txt b/contrib/pyln-client/requirements.txt
index 20a01a09cf71..e7776fb68ac9 100644
--- a/contrib/pyln-client/requirements.txt
+++ b/contrib/pyln-client/requirements.txt
@@ -1,2 +1,3 @@
 recommonmark~=0.7
 pyln-bolt7
+pyln-proto
diff --git a/contrib/pyln-testing/pyln/testing/utils.py b/contrib/pyln-testing/pyln/testing/utils.py
index 14e93a9e70c8..f986e4ffcdae 100644
--- a/contrib/pyln-testing/pyln/testing/utils.py
+++ b/contrib/pyln-testing/pyln/testing/utils.py
@@ -961,7 +961,7 @@ def wait_for_channel_updates(self, scids):
                                   + ['Received channel_update for channel {}/1'.format(c)
                                      for c in scids])
 
-    def wait_for_route(self, destination, timeout=30):
+    def wait_for_route(self, destination, timeout=TIMEOUT):
         """ Wait for a route to the destination to become available.
         """
         start_time = time.time()
diff --git a/tools/headerversions.c b/tools/headerversions.c
index 4ecf937c52d0..5e0056be56a3 100644
--- a/tools/headerversions.c
+++ b/tools/headerversions.c
@@ -31,9 +31,14 @@ static const char template[] =
 	"{\n"
 	"	char compiled_gmp_version[100];\n"
 	IF_SQLITE3(
-	"	if (SQLITE_VERSION_NUMBER != sqlite3_libversion_number())\n"
+	"       /* Require at least the version we compiled with. */"
+	"	if (SQLITE_VERSION_NUMBER > sqlite3_libversion_number())\n"
 	"		errx(1, \"SQLITE version mismatch: compiled %%u, now %%u\",\n"
 	"		     SQLITE_VERSION_NUMBER, sqlite3_libversion_number());\n"
+	"       /* Ensure the major version matches. */"
+	"	if (SQLITE_VERSION_NUMBER + 1000000 < sqlite3_libversion_number())\n"
+	"		errx(1, \"SQLITE major version mismatch: compiled %%u, now %%u\",\n"
+	"		     SQLITE_VERSION_NUMBER, sqlite3_libversion_number());\n"
 	)
 	"	/* zlib documents that first char alters ABI. Kudos! */\n"
 	"	if (zlibVersion()[0] != ZLIB_VERSION[0])\n"