diff --git a/cpp-client/README.md b/cpp-client/README.md
index 01823519bd4..0db29007204 100644
--- a/cpp-client/README.md
+++ b/cpp-client/README.md
@@ -1,10 +1,10 @@
-# Building the C++ client from a base Ubuntu 20.04 image
+# Building the C++ client from a base Ubuntu 20.04 or 22.04 image
 
 These instructions show how to install and run the Deephaven C++ client, its dependencies,
-and its unit tests. We have tested these instructions in Ubuntu 20.04 with the default
+and its unit tests. We have tested these instructions in Ubuntu 20.04 and 22.04 with the default
 C++ compiler and tool suite (cmake etc).
 
-1. Start with an Ubuntu 20.04 install
+1. Start with an Ubuntu 20.04 or 22.04 install
 
 2. Get Deephaven running by following the instructions here: https://deephaven.io/core/docs/how-to-guides/launch-build/
 
diff --git a/cpp-client/deephaven/client/src/table/table.cc b/cpp-client/deephaven/client/src/table/table.cc
index d37228f69f7..2defa7f9810 100644
--- a/cpp-client/deephaven/client/src/table/table.cc
+++ b/cpp-client/deephaven/client/src/table/table.cc
@@ -8,6 +8,8 @@
 #include "deephaven/client/container/row_sequence.h"
 #include "deephaven/client/utility/utility.h"
 
+#include <optional>
+
 using deephaven::client::chunk::AnyChunk;
 using deephaven::client::chunk::BooleanChunk;
 using deephaven::client::chunk::ChunkMaker;