diff --git a/libraries/baking/CMakeLists.txt b/libraries/baking/CMakeLists.txt
index aeb4346f93..73618427f6 100644
--- a/libraries/baking/CMakeLists.txt
+++ b/libraries/baking/CMakeLists.txt
@@ -4,5 +4,3 @@ setup_hifi_library(Concurrent)
 link_hifi_libraries(shared shaders graphics networking material-networking graphics-scripting ktx image fbx model-baker task)
 include_hifi_library_headers(gpu)
 include_hifi_library_headers(hfm)
-
-target_draco()
diff --git a/libraries/baking/src/MaterialBaker.cpp b/libraries/baking/src/MaterialBaker.cpp
index 558adedf68..24d031c39e 100644
--- a/libraries/baking/src/MaterialBaker.cpp
+++ b/libraries/baking/src/MaterialBaker.cpp
@@ -11,6 +11,8 @@
 
 #include "MaterialBaker.h"
 
+#include <unordered_map>
+
 #include "QJsonObject"
 #include "QJsonDocument"
 
@@ -124,7 +126,7 @@ void MaterialBaker::processMaterial() {
                             return;
                         }
 
-                        QPair<QUrl, image::TextureUsage::Type> textureKey = { textureURL, it->second };
+                        QPair<QUrl, image::TextureUsage::Type> textureKey { textureURL, it->second };
                         if (!_textureBakers.contains(textureKey)) {
                             QSharedPointer<TextureBaker> textureBaker {
                                 new TextureBaker(textureURL, it->second, _textureOutputDir),
diff --git a/libraries/baking/src/baking/FSTBaker.h b/libraries/baking/src/baking/FSTBaker.h
index aeb7286af3..85c7c93a37 100644
--- a/libraries/baking/src/baking/FSTBaker.h
+++ b/libraries/baking/src/baking/FSTBaker.h
@@ -21,7 +21,7 @@ public:
     FSTBaker(const QUrl& inputMappingURL, TextureBakerThreadGetter inputTextureThreadGetter,
         const QString& bakedOutputDirectory, const QString& originalOutputDirectory = "", bool hasBeenBaked = false);
 
-    virtual QUrl getFullOutputMappingURL() const;
+    virtual QUrl getFullOutputMappingURL() const override;
 
 signals:
     void fstLoaded();
diff --git a/libraries/model-baker/CMakeLists.txt b/libraries/model-baker/CMakeLists.txt
index 22c240b487..6c0f220340 100644
--- a/libraries/model-baker/CMakeLists.txt
+++ b/libraries/model-baker/CMakeLists.txt
@@ -4,4 +4,6 @@ setup_hifi_library()
 link_hifi_libraries(shared shaders task gpu graphics hfm material-networking)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(image)
-include_hifi_library_headers(ktx)
\ No newline at end of file
+include_hifi_library_headers(ktx)
+
+target_draco()
diff --git a/tools/oven/src/DomainBaker.cpp b/tools/oven/src/DomainBaker.cpp
index 5f8ec3a678..639ab8b948 100644
--- a/tools/oven/src/DomainBaker.cpp
+++ b/tools/oven/src/DomainBaker.cpp
@@ -145,7 +145,7 @@ void DomainBaker::loadLocalFile() {
     }
 }
 
-void DomainBaker::addModelBaker(const QString& property, const QString& url, QJsonValueRef& jsonRef) {
+void DomainBaker::addModelBaker(const QString& property, const QString& url, const QJsonValueRef& jsonRef) {
     // grab a QUrl for the model URL
     QUrl bakeableModelURL = getBakeableModelURL(url);
     if (!bakeableModelURL.isEmpty() && (_shouldRebakeOriginals || !isModelBaked(bakeableModelURL))) {
@@ -185,7 +185,7 @@ void DomainBaker::addModelBaker(const QString& property, const QString& url, QJs
     }
 }
 
-void DomainBaker::addTextureBaker(const QString& property, const QString& url, image::TextureUsage::Type type, QJsonValueRef& jsonRef) {
+void DomainBaker::addTextureBaker(const QString& property, const QString& url, image::TextureUsage::Type type, const QJsonValueRef& jsonRef) {
     QString cleanURL = QUrl(url).adjusted(QUrl::RemoveQuery | QUrl::RemoveFragment).toDisplayString();
     auto idx = cleanURL.lastIndexOf('.');
     auto extension = idx >= 0 ? url.mid(idx + 1).toLower() : "";
@@ -225,7 +225,7 @@ void DomainBaker::addTextureBaker(const QString& property, const QString& url, i
     }
 }
 
-void DomainBaker::addScriptBaker(const QString& property, const QString& url, QJsonValueRef& jsonRef) {
+void DomainBaker::addScriptBaker(const QString& property, const QString& url, const QJsonValueRef& jsonRef) {
     // grab a clean version of the URL without a query or fragment
     QUrl scriptURL = QUrl(url).adjusted(QUrl::RemoveQuery | QUrl::RemoveFragment);
 
@@ -257,7 +257,7 @@ void DomainBaker::addScriptBaker(const QString& property, const QString& url, QJ
     _entitiesNeedingRewrite.insert(scriptURL, { property, jsonRef });
 }
 
-void DomainBaker::addMaterialBaker(const QString& property, const QString& data, bool isURL, QJsonValueRef& jsonRef) {
+void DomainBaker::addMaterialBaker(const QString& property, const QString& data, bool isURL, const QJsonValueRef& jsonRef) {
     // grab a clean version of the URL without a query or fragment
     QString materialData;
     if (isURL) {
diff --git a/tools/oven/src/DomainBaker.h b/tools/oven/src/DomainBaker.h
index c9f5a59672..81f5c345cd 100644
--- a/tools/oven/src/DomainBaker.h
+++ b/tools/oven/src/DomainBaker.h
@@ -73,10 +73,10 @@ private:
 
     bool _shouldRebakeOriginals { false };
 
-    void addModelBaker(const QString& property, const QString& url, QJsonValueRef& jsonRef);
-    void addTextureBaker(const QString& property, const QString& url, image::TextureUsage::Type type, QJsonValueRef& jsonRef);
-    void addScriptBaker(const QString& property, const QString& url, QJsonValueRef& jsonRef);
-    void addMaterialBaker(const QString& property, const QString& data, bool isURL, QJsonValueRef& jsonRef);
+    void addModelBaker(const QString& property, const QString& url, const QJsonValueRef& jsonRef);
+    void addTextureBaker(const QString& property, const QString& url, image::TextureUsage::Type type, const QJsonValueRef& jsonRef);
+    void addScriptBaker(const QString& property, const QString& url, const QJsonValueRef& jsonRef);
+    void addMaterialBaker(const QString& property, const QString& data, bool isURL, const QJsonValueRef& jsonRef);
 };
 
 #endif // hifi_DomainBaker_h