diff --git a/src/EngineInterface.h b/src/EngineInterface.h
index e35b0a4..c241878 100644
--- a/src/EngineInterface.h
+++ b/src/EngineInterface.h
@@ -31,7 +31,7 @@ struct EI_RenderTargetSet;          // Render set
 
 enum EI_ShaderStage
 {
-    EI_UNINITIALIZED = 0,  // we will always specify shader stage.  "all" is never used.
+    EI_UNINITIALIZED = 0,
     EI_VS,
     EI_PS,
     EI_CS,
diff --git a/src/TressFX/TressFXBoneSkinning.cpp b/src/TressFX/TressFXBoneSkinning.cpp
index 34cd0d0..0c6ff16 100644
--- a/src/TressFX/TressFXBoneSkinning.cpp
+++ b/src/TressFX/TressFXBoneSkinning.cpp
@@ -413,7 +413,7 @@ Vector3 TressFXBoneSkinning::SkinPosition( int i )
     // compute a bone skinning transform
     TressFXBoneSkinningData skinning = boneSkinningData[global_id];
 
-    std::vector<XMMATRIX>& skinningMatrices = m_pScene->GetWorldSpaceSkeletonMats(m_skinNumber);
+    const std::vector<XMMATRIX>& skinningMatrices = m_pScene->GetWorldSpaceSkeletonMats(m_skinNumber);
     // Interpolate world space bone matrices using weights.
     XMMATRIX bone_matrix = skinningMatrices[(int)skinning.boneIndex[0]] * skinning.weight[0];
     float weight_sum = skinning.weight[0];
diff --git a/src/TressFX/TressFXHairObject.cpp b/src/TressFX/TressFXHairObject.cpp
index e7ead61..78c611e 100644
--- a/src/TressFX/TressFXHairObject.cpp
+++ b/src/TressFX/TressFXHairObject.cpp
@@ -338,7 +338,7 @@ void TressFXHairObject::UploadRenderingGPUResources(EI_CommandContext&  commandC
    
 }
 
-void TressFXHairObject::PopulateDrawStrandsBindSet(EI_Device* pDevice, TressFXRenderingSettings* pRenderSettings/*=nullptr*/)
+void TressFXHairObject::PopulateDrawStrandsBindSet(EI_Device* pDevice, const TressFXRenderingSettings* pRenderSettings/*=nullptr*/)
 {
     if (pRenderSettings)
     {
@@ -348,7 +348,7 @@ void TressFXHairObject::PopulateDrawStrandsBindSet(EI_Device* pDevice, TressFXRe
         }
         if (pRenderSettings->m_StrandAlbedoName != "<none>")
         {
-            m_StrandAlbedo = GetDevice()->CreateResourceFromFile(pRenderSettings->m_BaseAlbedoName.c_str(), true);
+            m_StrandAlbedo = GetDevice()->CreateResourceFromFile(pRenderSettings->m_StrandAlbedoName.c_str(), true);
         }
     }
     EI_BindSetDescription bindSetDesc =
diff --git a/src/TressFX/TressFXHairObject.h b/src/TressFX/TressFXHairObject.h
index 8f156e3..17090ea 100644
--- a/src/TressFX/TressFXHairObject.h
+++ b/src/TressFX/TressFXHairObject.h
@@ -128,7 +128,7 @@ class TressFXHairObject : private TressFXNonCopyable
     void UpdatePerObjectRenderParams(EI_CommandContext& commandContext);
     void IncreaseSimulationFrame() { m_SimCB[m_SimulationFrame%2]->g_ResetPositions = 0.0f; m_SimulationFrame++; }
 
-    void PopulateDrawStrandsBindSet(EI_Device* pDevice, TressFXRenderingSettings* pRenderSettings=nullptr);
+    void PopulateDrawStrandsBindSet(EI_Device* pDevice, const TressFXRenderingSettings* pRenderSettings=nullptr);
 private:
     // Turn raw data into GPU resources for rendering.
     void CreateRenderingGPUResources(EI_Device*   pDevice,