diff --git a/include/hermes/VM/CallResult.h b/include/hermes/VM/CallResult.h
index 0a10353b4b5..cb24cc5ec93 100644
--- a/include/hermes/VM/CallResult.h
+++ b/include/hermes/VM/CallResult.h
@@ -281,7 +281,7 @@ template <typename T>
 class CallResult<PseudoHandle<T>, detail::CallResultSpecialize::PseudoHandle> {
   PseudoHandle<T> valueOrStatus_;
 
-#ifdef NDEBUG
+#if defined(NDEBUG) && !defined(_WINDOWS)
   static_assert(
       hermes::IsTriviallyCopyable<PseudoHandle<T>, true>::value,
       "PseudoHandle<T> must be trivially copyable");
diff --git a/tools/repl/CMakeLists.txt b/tools/repl/CMakeLists.txt
index 594640ee18c..4b9af940669 100644
--- a/tools/repl/CMakeLists.txt
+++ b/tools/repl/CMakeLists.txt
@@ -4,10 +4,11 @@
 # LICENSE file in the root directory of this source tree.
 
 find_library(LIBREADLINE_FOUND readline)
+find_library(LIBTINFO_FOUND tinfo)
 
-if(LIBREADLINE_FOUND)
+if(LIBREADLINE_FOUND AND LIBTINFO_FOUND)
   set(HAVE_LIBREADLINE 1)
-  set(LIBREADLINE ${LIBREADLINE_FOUND})
+  set(LIBREADLINE ${LIBREADLINE_FOUND} ${LIBTINFO_FOUND})
 endif()
 
 configure_file(ReplConfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/ReplConfig.h