diff --git a/Engine/source/lighting/advanced/hlsl/deferredShadingFeaturesHLSL.h b/Engine/source/lighting/advanced/hlsl/deferredShadingFeaturesHLSL.h
index b7fd23f9e..21abe52df 100644
--- a/Engine/source/lighting/advanced/hlsl/deferredShadingFeaturesHLSL.h
+++ b/Engine/source/lighting/advanced/hlsl/deferredShadingFeaturesHLSL.h
@@ -82,7 +82,7 @@ public:
    void processPix(Vector<ShaderComponent*> &componentList,
       const MaterialFeatureData &fd) override;
 
-   U32 getShaderStages() override { return GFXShaderStage::PIXEL_SHADER; }
+   //U32 getShaderStages() override { return GFXShaderStage::PIXEL_SHADER; }
 
    U32 getOutputTargets(const MaterialFeatureData& fd) const override;
 
diff --git a/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h b/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h
index 57873b03d..58a3eb4bf 100644
--- a/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h
+++ b/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h
@@ -309,7 +309,7 @@ public:
    void processPix(   Vector<ShaderComponent*> &componentList, 
                               const MaterialFeatureData &fd ) override;
 
-   U32 getShaderStages() override { return GFXShaderStage::PIXEL_SHADER; }
+   //U32 getShaderStages() override { return GFXShaderStage::PIXEL_SHADER; }
 
    Material::BlendOp getBlendOp() override{ return Material::None; }
 
@@ -563,7 +563,7 @@ public:
    void processPix(   Vector<ShaderComponent*> &componentList, 
                               const MaterialFeatureData &fd ) override;
 
-   U32 getShaderStages() override { return GFXShaderStage::PIXEL_SHADER; }
+   //U32 getShaderStages() override { return GFXShaderStage::PIXEL_SHADER; }
 
    String getName() override
    {
diff --git a/Engine/source/shaderGen/shaderGen.cpp b/Engine/source/shaderGen/shaderGen.cpp
index d9f69e523..ab29205cf 100644
--- a/Engine/source/shaderGen/shaderGen.cpp
+++ b/Engine/source/shaderGen/shaderGen.cpp
@@ -227,7 +227,7 @@ void ShaderGen::generateShader( const MaterialFeatureData& featureData,
          const FeatureType& type = features.getAt(i);
          if (stage & FEATUREMGR->getByType(type)->getShaderStages())
          {
-            stageName += type.getName() + "," + String::ToString(i);
+            stageName += type.getName();
          }
       }