diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05fc783..e367344 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -313,7 +313,7 @@ add_mp_library(format OBJECT
 set(MP_EXPR_INFO_FILE ${MP_SOURCE_DIR}/src/expr-info.cc)
 set(MP_NL_OPCODES_FILE
   ${MP_SOURCE_DIR}/nl-writer2/include/mp/nl-opcodes.h)
-add_executable(gen-expr-info EXCLUDE_FROM_ALL
+add_executable(gen-expr-info
   src/gen-expr-info.cc $<TARGET_OBJECTS:format>)
 if (MINGW)
   SET_TARGET_PROPERTIES(gen-expr-info PROPERTIES
@@ -505,7 +505,7 @@ if (NOT SKIP_BUILD_MP)
 	install(DIRECTORY include/mp DESTINATION include)
 	install(TARGETS mp DESTINATION lib RUNTIME DESTINATION bin)
 	install(FILES LICENSE.rst DESTINATION share/mp)
-
+  install(TARGETS gen-expr-info RUNTIME DESTINATION bin)
 endif()   ## NOT SKIP_BUILD_MP
 
 # If we want to generate the op file only, we are done here.
diff --git a/src/amplsig/CMakeLists.txt b/src/amplsig/CMakeLists.txt
index a9b75d0..0dcfe3e 100644
--- a/src/amplsig/CMakeLists.txt
+++ b/src/amplsig/CMakeLists.txt
@@ -17,5 +17,5 @@ find_library(WS2_32_LIBRARY Ws2_32
 PATHS ${WIN_LIBRARY_DIR} NO_DEFAULT_PATH)
 if (WS2_32_LIBRARY)
   add_ampl_library(amplsig amplsig.cc)
-  target_link_libraries(amplsig mp ${WS2_32_LIBRARY})
+  target_link_libraries(amplsig mp ws2_32)
 endif ()