diff --git a/indra/cmake/NGHTTP2.cmake b/indra/cmake/NGHTTP2.cmake
index df191ff3c1..f83c851444 100644
--- a/indra/cmake/NGHTTP2.cmake
+++ b/indra/cmake/NGHTTP2.cmake
@@ -9,7 +9,9 @@ else (USESYSTEMLIBS)
   use_prebuilt_binary(nghttp2)
   if (WINDOWS)
     set(NGHTTP2_LIBRARIES 
-      ${ARCH_PREBUILT_DIRS_RELEASE}/nghttp2.lib
+      # <FS:Ansariel> ARCH_PREBUILT_DIRS_RELEASE is "." and would cause searching for the lib in the wrong place when not using VS
+      #${ARCH_PREBUILT_DIRS_RELEASE}/nghttp2.lib
+      nghttp2.lib
       )
   elseif (DARWIN)
     set(NGHTTP2_LIBRARIES libnghttp2.dylib)
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index 259bb20cc4..460e09ad2d 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -75,7 +75,7 @@ if (LINUX)
       ${LLMATH_LIBRARIES}
       ${LLRENDER_LIBRARIES}
       ${LLVFS_LIBRARIES}
-      ${LLWINDOW_LIBRARIES}
+      #${LLWINDOW_LIBRARIES} # <FS:Ansariel> Don't link to itself - causes CMP0038
       ${LLXML_LIBRARIES}
       ${UI_LIBRARIES}     # for GTK
       ${SDL_LIBRARY}
@@ -187,11 +187,6 @@ endif (llwindow_HEADER_FILES)
 
   list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES})
 
-  #<FS:TS> Turn off complaint about library linking to itself in Cmake 3
-  if(POLICY CMP0038)
-    cmake_policy(SET CMP0038 OLD)
-  endif(POLICY CMP0038)
-
   add_library (llwindow
     ${llwindow_SOURCE_FILES}
     ${viewer_SOURCE_FILES}
diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh
index 164ac6b4b5..605e1335d6 100755
--- a/scripts/configure_firestorm.sh
+++ b/scripts/configure_firestorm.sh
@@ -65,8 +65,8 @@ showUsage()
     echo "  --config                 : Generate a new architecture-specific config"
     echo "  --build                  : Build Firestorm"
     echo "  --version                : Update version number"
-    echo "  --chan  [Release|Beta|Private]   : Private is the default, sets channel"
-    echo "  --btype [Release|RelWithDebInfo] : Release is default, whether to use symbols"
+    echo "  --chan  [Release|Beta|Private]         : Private is the default, sets channel"
+    echo "  --btype [Release|RelWithDebInfo|Debug] : Release is default, whether to use symbols"
     echo "  --kdu                    : Build with KDU"
     echo "  --package                : Build installer"
     echo "  --no-package             : Build without installer (Overrides --package)"
@@ -81,6 +81,7 @@ showUsage()
     echo "  --testbuild <days>       : Create time-limited test build (build date + <days>)"
     echo "  --platform <platform>    : Build for specified platform (darwin | windows | linux)"
     echo "  --jobs <num>             : Build with <num> jobs in parallel (Linux and Darwin only)"
+    echo "  --ninja                  : Build using Ninja (Linux only)"
     echo
     echo "All arguments not in the above list will be passed through to LL's configure/build."
     echo