diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab66c6d5ed..59798953f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -245,6 +245,7 @@ endif()
 if (ANDROID OR DESKTOP_GVR)
   add_subdirectory(interface)
   add_subdirectory(gvr-interface)
+  add_subdirectory(plugins)
 endif ()
 
 if (DEFINED ENV{HIFI_MEMORY_DEBUGGING})
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 9ada1300c9..2862891567 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -168,7 +168,7 @@ if (WIN32)
 endif()
 
 if (NOT ANDROID)
-  set(${STEAM_WRAPPER} steamworks-wrapper)
+  set(${NON_ANDROID_LIBRARIES} controllers ui-plugins display-plugins input-plugins steamworks-wrapper)
 endif ()
 
 # link required hifi libraries
@@ -177,8 +177,8 @@ link_hifi_libraries(
   recording fbx networking model-networking entities avatars
   audio audio-client animation script-engine physics
   render-utils entities-renderer ui auto-updater
-  controllers plugins ui-plugins display-plugins input-plugins
-  ${STEAM_WRAPPER}
+  controllers plugins
+  ${NON_ANDROID_LIBRARIES}
 )
 
 # include the binary directory of render-utils for shader includes
diff --git a/libraries/controllers/CMakeLists.txt b/libraries/controllers/CMakeLists.txt
index 5beffce461..384218691a 100644
--- a/libraries/controllers/CMakeLists.txt
+++ b/libraries/controllers/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(TARGET_NAME controllers)
 
 # set a default root dir for each of our optional externals if it was not passed
-setup_hifi_library(Script)
+setup_hifi_library(Script Qml)
 
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 link_hifi_libraries(shared)
@@ -11,4 +11,3 @@ GroupSources("src/controllers")
 add_dependency_external_projects(glm)
 find_package(GLM REQUIRED)
 target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS})
-
diff --git a/libraries/plugins/CMakeLists.txt b/libraries/plugins/CMakeLists.txt
index e7798e9f3d..6067c0fbed 100644
--- a/libraries/plugins/CMakeLists.txt
+++ b/libraries/plugins/CMakeLists.txt
@@ -1,4 +1,4 @@
 set(TARGET_NAME plugins)
 setup_hifi_library(OpenGL)
-link_hifi_libraries(shared)
+link_hifi_libraries(shared networking)
 include_hifi_library_headers(gpu)
diff --git a/libraries/shared/src/shared/Bilateral.h b/libraries/shared/src/shared/Bilateral.h
index c4daf60177..edcaa49540 100644
--- a/libraries/shared/src/shared/Bilateral.h
+++ b/libraries/shared/src/shared/Bilateral.h
@@ -28,7 +28,7 @@ namespace bilateral {
             case Side::Right:
                 return 0x02;
         }
-        return UINT8_MAX;
+        return std::numeric_limits<uint8_t>::max();
     }
 
     inline uint8_t index(Side side) {
@@ -38,7 +38,7 @@ namespace bilateral {
             case Side::Right:
                 return 1;
         }
-        return UINT8_MAX;
+        return std::numeric_limits<uint8_t>::max();
     }
 
     template <typename F>