diff --git a/src/http/WServer.C b/src/http/WServer.C
index 9d42f54..f979f32 100644
--- a/src/http/WServer.C
+++ b/src/http/WServer.C
@@ -276,9 +276,6 @@ void WServer::restart(int argc, char **argv, char **envp)
 {
 #ifndef WIN32
   char *path = realpath(argv[0], 0);
-#else
-  char *path = argv[0];
-#endif
 
   // Try a few times since this may fail because we have an incomplete
   // binary...
@@ -292,6 +289,7 @@ void WServer::restart(int argc, char **argv, char **envp)
 #endif
   }
   perror("execve");
+#endif
 }
 
 void WServer::handleRequest(WebRequest *request)
@@ -363,7 +361,8 @@ int WServer::waitForShutdown(const char *restartWatchFile)
   return 0;
 
 #endif // WIN32
-
+#else
+  return 0;
 #endif // WT_THREADED
 }
 
@@ -391,9 +390,11 @@ int WRun(int argc, char *argv[], ApplicationCreator createApplication)
       server.setServerConfiguration(argc, argv, WTHTTP_CONFIGURATION);
       server.addEntryPoint(Application, createApplication);
       if (server.start()) {
+#ifdef WT_THREADED
 	int sig = WServer::waitForShutdown(argv[0]);
 	server.impl()->serverConfiguration_.log("notice")
 	  << "Shutdown (signal = " << sig << ")";
+#endif
 	server.stop();
 #ifndef WIN32
 	if (sig == SIGHUP)
diff --git a/src/isapi/CMakeLists.txt b/src/isapi/CMakeLists.txt
index 772b59e..4b7e5fa 100644
--- a/src/isapi/CMakeLists.txt
+++ b/src/isapi/CMakeLists.txt
@@ -1,31 +1,35 @@
 IF(CONNECTOR_ISAPI)
-  MESSAGE("** Enabling ISAPI.")
+  IF(NOT MULTI_THREADED)
+    MESSAGE("** Disabling ISAPI because MULTI_THREADED is disabled.")
+  ELSE(NOT MULTI_THREADED)
+    MESSAGE("** Enabling ISAPI.")
 
-  ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501)
+    ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501)
 
-  SET(libsapisources
-    Server.C
-    Isapi.C
-    IsapiRequest.C
-    IsapiStream.C
-  )
+    SET(libsapisources
+      Server.C
+      Isapi.C
+      IsapiRequest.C
+      IsapiStream.C
+    )
 
-  INCLUDE_DIRECTORIES(${FCGI_INCLUDE_DIRS})
-  ADD_LIBRARY(wtisapi ${libsapisources})
-  TARGET_LINK_LIBRARIES(wtisapi wt)
+    INCLUDE_DIRECTORIES(${FCGI_INCLUDE_DIRS})
+    ADD_LIBRARY(wtisapi ${libsapisources})
+    TARGET_LINK_LIBRARIES(wtisapi wt)
 
-  SET_TARGET_PROPERTIES(
-    wtisapi
-  PROPERTIES
-    VERSION ${VERSION_SERIES}.${VERSION_MAJOR}.${VERSION_MINOR}
-    SOVERSION ${WTISAPI_SOVERSION}
-    DEBUG_POSTFIX "d"
-  )
+    SET_TARGET_PROPERTIES(
+      wtisapi
+    PROPERTIES
+      VERSION ${VERSION_SERIES}.${VERSION_MAJOR}.${VERSION_MINOR}
+      SOVERSION ${WTISAPI_SOVERSION}
+      DEBUG_POSTFIX "d"
+    )
 
-  INSTALL(TARGETS wtisapi
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
+    INSTALL(TARGETS wtisapi
+      RUNTIME DESTINATION bin
+      LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+      ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
+    ENDIF(NOT MULTI_THREADED)
 ELSE(CONNECTOR_ISAPI)
   MESSAGE("** Disabling ISAPI.")
 ENDIF(CONNECTOR_ISAPI)