diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index e9098c822b..8d0b5daee3 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -48,7 +48,7 @@
 const QString GRABBABLE_USER_DATA = "{\"grabbableKey\":{\"grabbable\":true}}";
 const QString NOT_GRABBABLE_USER_DATA = "{\"grabbableKey\":{\"grabbable\":false}}";
 
-static void staticScriptInitializer(ScriptManager* manager) {
+void staticEntityScriptInitializer(ScriptManager* manager) {
     auto scriptEngine = manager->engine().data();
 
     auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
@@ -76,7 +76,7 @@ static void staticScriptInitializer(ScriptManager* manager) {
     manager->connect(manager, &ScriptManager::releaseEntityPacketSenderMessages, entityScriptingInterface.data(),
                      &EntityScriptingInterface::releaseEntityPacketSenderMessages, Qt::DirectConnection);
 }
-STATIC_SCRIPT_INITIALIZER(staticScriptInitializer);
+STATIC_SCRIPT_INITIALIZER(staticEntityScriptInitializer);
 
 EntityScriptingInterface::EntityScriptingInterface(bool bidOnSimulationOwnership) :
     _entityTree(nullptr),
@@ -2433,7 +2433,7 @@ void EntityScriptingInterface::getMeshes(const QUuid& entityID, const ScriptValu
     EntityItemPointer entity = static_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(entityID));
     if (!entity) {
         qCDebug(entities) << "EntityScriptingInterface::getMeshes no entity with ID" << entityID;
-        ScriptValueList args { engine->undefinedValue(), false };
+        ScriptValueList args{ engine->undefinedValue(), engine->newValue(false) };
         callback.call(ScriptValue(), args);
         return;
     }
@@ -2446,7 +2446,7 @@ void EntityScriptingInterface::getMeshes(const QUuid& entityID, const ScriptValu
         ScriptValueList args{ resultAsScriptValue, engine->newValue(true) };
         callback.call(ScriptValue(), args);
     } else {
-        ScriptValueList args { engine->undefinedValue(), engine->newValue(false) };
+        ScriptValueList args{ engine->undefinedValue(), engine->newValue(false) };
         callback.call(ScriptValue(), args);
     }
 }
diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h
index 3f21a3733f..7e6864e05f 100644
--- a/libraries/entities/src/EntityScriptingInterface.h
+++ b/libraries/entities/src/EntityScriptingInterface.h
@@ -2542,7 +2542,7 @@ protected:
 
 private:
     void attachDefaultEventHandlers(ScriptManager* manager);  // called on first call to Script.addEventHandler
-    friend void staticScriptInitializer(ScriptManager* manager);
+    friend void staticEntityScriptInitializer(ScriptManager* manager);
 
 private slots:
     void releaseEntityPacketSenderMessages(bool wait);
diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.cpp b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.cpp
index e42d3ad86a..9730fd0ec8 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingUtil.cpp
@@ -114,7 +114,7 @@ ScriptValue jsBindCallback(const ScriptValue& value) {
 template <typename T>
 T this_qobject_cast(ScriptEngine* engine) {
     auto context = engine ? engine->currentContext() : nullptr;
-    return scriptvalue_cast<T>(context ? context->thisObject() : ScriptValue::NullValue);
+    return scriptvalue_cast<T>(context ? context->thisObject() : engine ? engine->nullValue() : ScriptValue());
 }
 QString toDebugString(QObject* tmp) {
     QString s;
diff --git a/libraries/script-engine/CMakeLists.txt b/libraries/script-engine/CMakeLists.txt
index 83ba2c63cc..ec30d52bfc 100644
--- a/libraries/script-engine/CMakeLists.txt
+++ b/libraries/script-engine/CMakeLists.txt
@@ -7,7 +7,6 @@ if (NOT ANDROID)
   target_quazip()
 endif ()
 
-link_hifi_libraries(shaders)
-include_hifi_library_headers(networking)
+link_hifi_libraries(networking)
 include_hifi_library_headers(octree)
 include_hifi_library_headers(shared)