diff --git a/mcrouter/Makefile.am b/mcrouter/Makefile.am
index b25494a25..bc76fa367 100644
--- a/mcrouter/Makefile.am
+++ b/mcrouter/Makefile.am
@@ -135,7 +135,11 @@ libmcroutercore_a_SOURCES = \
   routes/FailoverRoute-inl.h \
   routes/FailoverRoute.h \
   routes/FailoverWithExptimeRouteFactory.h \
+  routes/HashStopAllowListRoute.h \
+  routes/HashStopAllowListRoute.cpp \
   routes/HostIdRouteFactory.h \
+  routes/KeyParseRoute.h \
+  routes/KeyParseRoute.cpp \
   routes/KeySplitRoute-inl.h \
   routes/KeySplitRoute.h \
   routes/L1L2CacheRouteFactory.h \
@@ -254,6 +258,7 @@ mcrouter_LDADD = \
   libmcroutercore.a \
   lib/libmcrouter.a \
   -lthriftcpp2 \
+  -lserverdbginfo \
   -ltransport \
   -lthriftanyrep \
   -lthrifttype \
@@ -264,6 +269,7 @@ mcrouter_LDADD = \
   -lthriftmetadata \
   -lasync \
   -lconcurrency \
+  -lruntime \
   -lthrift-core \
 	-lfmt \
   -lwangle \
diff --git a/mcrouter/configure.ac b/mcrouter/configure.ac
index 3e217b05b..0257f7876 100644
--- a/mcrouter/configure.ac
+++ b/mcrouter/configure.ac
@@ -54,7 +54,7 @@ AX_PYTHON_DEVEL()
 AX_CXX_COMPILE_STDCXX_14([],[mandatory])
 LT_INIT
 
-CXXFLAGS="-fno-strict-aliasing -std=c++17 $CXXFLAGS"
+CXXFLAGS="-fno-strict-aliasing -std=c++20 $CXXFLAGS"
 CXXFLAGS="-W -Wall -Wextra -Wno-unused-parameter $CXXFLAGS"
 CXXFLAGS=" -Wno-missing-field-initializers -Wno-deprecated $CXXFLAGS"
 CXXFLAGS="-DLIBMC_FBTRACE_DISABLE -DDISABLE_COMPRESSION $CXXFLAGS"
diff --git a/mcrouter/lib/network/test/Makefile.am b/mcrouter/lib/network/test/Makefile.am
index d858ae6f6..8f9106c22 100644
--- a/mcrouter/lib/network/test/Makefile.am
+++ b/mcrouter/lib/network/test/Makefile.am
@@ -17,8 +17,9 @@ mock_mc_server_CPPFLAGS = -I$(top_srcdir)/..
 mock_mc_server_LDADD = \
 	$(top_builddir)/lib/libmcrouter.a \
 	-lthriftcpp2 \
+	-lserverdbginfo \
 	-ltransport \
-  -lthriftanyrep \
+	-lthriftanyrep \
 	-lthrifttype \
 	-lthrifttyperep \
 	-lthriftprotocol \
@@ -26,6 +27,7 @@ mock_mc_server_LDADD = \
 	-lthriftmetadata \
 	-lasync \
 	-lconcurrency \
+	-lruntime \
 	-lthrift-core \
 	-lfmt \
 	-lfizz \