diff --git a/doc/manual/generate-manpage.nix b/doc/manual/generate-manpage.nix
index ae31b2a1f61..ba5667a4305 100644
--- a/doc/manual/generate-manpage.nix
+++ b/doc/manual/generate-manpage.nix
@@ -93,9 +93,6 @@ let
 
       maybeProse =
         # FIXME: this is a horrible hack to keep `nix help-stores` working.
-        # the correct answer to this is to remove that command and replace it
-        # by statically generated manpages or the output of something like `nix
-        # store info <store type>`.
         let
           help-stores = ''
             ${index}
@@ -121,7 +118,7 @@ let
           };
         in
         optionalString (details ? doc) (
-          if match "@store-types@" details.doc != [ ]
+          if match ".*@store-types@.*" details.doc != null
           then help-stores
           else details.doc
         );
diff --git a/tests/unit/libstore/serve-protocol.cc b/tests/unit/libstore/serve-protocol.cc
index 597c0b570ee..b2fd0fb8248 100644
--- a/tests/unit/libstore/serve-protocol.cc
+++ b/tests/unit/libstore/serve-protocol.cc
@@ -412,7 +412,7 @@ TEST_F(ServeProtoTest, handshake_log)
         toClient.create();
         toServer.create();
 
-        ServeProto::Version clientResult, serverResult;
+        ServeProto::Version clientResult;
 
         auto thread = std::thread([&]() {
             FdSink out { toServer.writeSide.get() };
@@ -425,7 +425,7 @@ TEST_F(ServeProtoTest, handshake_log)
         {
             FdSink out { toClient.writeSide.get() };
             FdSource in { toServer.readSide.get() };
-            serverResult = ServeProto::BasicServerConnection::handshake(
+            ServeProto::BasicServerConnection::handshake(
                 out, in, defaultVersion);
         };