diff --git a/quiche/src/h3/qpack/huffman/table.rs b/quiche/src/h3/qpack/huffman/table.rs
index 011272cb03..ea1649a684 100644
--- a/quiche/src/h3/qpack/huffman/table.rs
+++ b/quiche/src/h3/qpack/huffman/table.rs
@@ -1,5 +1,5 @@
 // (num-bits, bits)
-pub const ENCODE_TABLE: [(usize, u64); 257] = [
+pub static ENCODE_TABLE: [(usize, u64); 257] = [
     (13, 0x1ff8),
     (23, 0x7fffd8),
     (28, 0xfffffe2),
diff --git a/quiche/src/lib.rs b/quiche/src/lib.rs
index f2ed8aa1d2..62c424a86e 100644
--- a/quiche/src/lib.rs
+++ b/quiche/src/lib.rs
@@ -3753,7 +3753,7 @@ impl Connection {
                 (pkt_type == Type::Handshake &&
                     self.local_error
                         .as_ref()
-                        .map_or(false, |le| le.is_app))) &&
+                        .is_some_and(|le| le.is_app))) &&
             path.active()
         {
             let ack_delay = pkt_space.largest_rx_pkt_time.elapsed();
@@ -6814,7 +6814,7 @@ impl Connection {
         if self
             .local_error
             .as_ref()
-            .map_or(false, |conn_err| !conn_err.is_app)
+            .is_some_and(|conn_err| !conn_err.is_app)
         {
             let epoch = match self.handshake.write_level() {
                 crypto::Level::Initial => packet::Epoch::Initial,
@@ -6880,7 +6880,7 @@ impl Connection {
                 self.dgram_send_queue.has_pending() ||
                 self.local_error
                     .as_ref()
-                    .map_or(false, |conn_err| conn_err.is_app) ||
+                    .is_some_and(|conn_err| conn_err.is_app) ||
                 self.streams.should_update_max_streams_bidi() ||
                 self.streams.should_update_max_streams_uni() ||
                 self.streams.has_flushable() ||