diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86fdb04fc7..d8fdc25b61 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ endif()
 
 project(
     OSGEARTH
-    DESCRIPTION "osgEarth 3D Geospatial SDK"
+    DESCRIPTION "osgEarth SDK"
     HOMEPAGE_URL "https://github.com/gwaldron/osgearth"
     LANGUAGES CXX C)
 
@@ -24,7 +24,7 @@ set(OSGEARTH_PATCH_VERSION 0)
 set(OSGEARTH_VERSION ${OSGEARTH_MAJOR_VERSION}.${OSGEARTH_MINOR_VERSION}.${OSGEARTH_PATCH_VERSION})
 
 # Increment this each time the ABI changes
-set(OSGEARTH_SOVERSION 157)
+set(OSGEARTH_SOVERSION 158)
 
 # Require C++14
 set(CMAKE_CXX_STANDARD 14)
@@ -52,10 +52,10 @@ set(OSGEARTH_EMBEDDED_THIRD_PARTY_DIR ${PROJECT_SOURCE_DIR}/src/third_party)
 
 # Default installation folders. The platform-specific includes will
 # override these values as necessary.
-set(INSTALL_RUNTIME_FOLDER "bin")  # executables
-set(INSTALL_LIBRARY_FOLDER "bin")  # .dll/.so
-set(INSTALL_ARCHIVE_FOLDER "lib")  # .lib/.a
-set(INSTALL_PLUGINS_FOLDER "bin")  # parent folder of OSG plugins folder
+set(INSTALL_RUNTIME_FOLDER "bin${OSGEARTH_INSTALL_FOLDER_SUFFIX}")  # executables
+set(INSTALL_LIBRARY_FOLDER "bin${OSGEARTH_INSTALL_FOLDER_SUFFIX}")  # .dll/.so
+set(INSTALL_ARCHIVE_FOLDER "lib${OSGEARTH_INSTALL_FOLDER_SUFFIX}")  # .lib/.a
+set(INSTALL_PLUGINS_FOLDER "bin${OSGEARTH_INSTALL_FOLDER_SUFFIX}")  # parent folder of OSG plugins folder
 
 include(oe_ios)
 include(oe_osx)
diff --git a/src/applications/CMakeLists.txt b/src/applications/CMakeLists.txt
index ff30754609..cfb70cd1cb 100644
--- a/src/applications/CMakeLists.txt
+++ b/src/applications/CMakeLists.txt
@@ -54,11 +54,9 @@ if(NOT OSGEARTH_BUILD_PLATFORM_IPHONE)
         add_subdirectory(osgearth_mrt)
         add_subdirectory(osgearth_pick)
         add_subdirectory(osgearth_skyview)
-        add_subdirectory(osgearth_lights)
         add_subdirectory(osgearth_infinitescroll)
         add_subdirectory(osgearth_video)
         add_subdirectory(osgearth_heatmap)
-        add_subdirectory(osgearth_collecttriangles)
         
         if(OSGEARTH_BUILD_LEGACY_CONTROLS_API)
             add_subdirectory(osgearth_cluster)
@@ -76,8 +74,10 @@ if(NOT OSGEARTH_BUILD_PLATFORM_IPHONE)
         set(TARGET_DEFAULT_LABEL_PREFIX "Test")
         set(TARGET_DEFAULT_APPLICATION_FOLDER "Tests")
         add_subdirectory(osgearth_bindless)
+        add_subdirectory(osgearth_collecttriangles)
         add_subdirectory(osgearth_drawables)
         add_subdirectory(osgearth_horizon)
+        add_subdirectory(osgearth_lights)
         add_subdirectory(osgearth_overlayviewer)
         add_subdirectory(osgearth_windows)