diff --git a/Engine/source/core/ogg/oggTheoraDecoder.cpp b/Engine/source/core/ogg/oggTheoraDecoder.cpp
index 1259c3afb..217b22a93 100644
--- a/Engine/source/core/ogg/oggTheoraDecoder.cpp
+++ b/Engine/source/core/ogg/oggTheoraDecoder.cpp
@@ -420,7 +420,7 @@ void OggTheoraDecoder::_transcode( th_ycbcr_buffer ycbcr, U8* buffer, const U32
 }
 
 //-----------------------------------------------------------------------------
-
+#if defined( TORQUE_CPU_X86 )
 void OggTheoraDecoder::_transcode420toRGBA_SSE2( th_ycbcr_buffer ycbcr, U8* buffer, U32 width, U32 height, U32 pitch )
 {
    AssertFatal( width % 2 == 0, "OggTheoraDecoder::_transcode420toRGBA_SSE2() - width must be multiple of 2" );
@@ -692,3 +692,4 @@ void OggTheoraDecoder::_transcode420toRGBA_SSE2( th_ycbcr_buffer ycbcr, U8* buff
    
    #endif
 }
+#endif
\ No newline at end of file
diff --git a/Engine/source/core/ogg/oggTheoraDecoder.h b/Engine/source/core/ogg/oggTheoraDecoder.h
index 5dc8fab26..f4ef5899b 100644
--- a/Engine/source/core/ogg/oggTheoraDecoder.h
+++ b/Engine/source/core/ogg/oggTheoraDecoder.h
@@ -172,10 +172,10 @@ class OggTheoraDecoder : public OggDecoder,
       /// Generic transcoder going from any of the Y'CbCr pixel formats to
       /// any RGB format (that is supported by GFXFormatUtils).
       void _transcode( th_ycbcr_buffer ycbcr, U8* buffer, U32 width, U32 height );
-      
-      /// Transcoder with fixed 4:2:0 to RGBA conversion using SSE2 assembly.
+#if defined( TORQUE_CPU_X86 )
+      /// Transcoder with fixed 4:2:0 to RGBA conversion using SSE2 assembly. Unused on 64 bit archetecture.
       void _transcode420toRGBA_SSE2( th_ycbcr_buffer ycbcr, U8* buffer, U32 width, U32 height, U32 pitch );
-      
+#endif
       // OggDecoder.
       virtual bool _detect( ogg_page* startPage );
       virtual bool _init();
diff --git a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp
index 99e41365c..e927deb06 100644
--- a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp
+++ b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp
@@ -2795,18 +2795,4 @@ void ImposterVertFeatureGLSL::determineFeature( Material *material,
 {      
    if ( features.hasFeature( MFT_ImposterVert ) )
       outFeatureData->features.addFeature( MFT_ImposterVert );
-}
-
-//****************************************************************************
-// Vertex position
-//****************************************************************************
-void DeferredSkyGLSL::processVert( Vector<ShaderComponent*> &componentList, 
-                                    const MaterialFeatureData &fd )
-{
-   Var *outPosition = (Var*)LangElement::find( "gl_Position" );
-   MultiLine *meta = new MultiLine;
-   //meta->addStatement( new GenOp( "   @.w = @.z;\r\n", outPosition, outPosition ) );
-
-   output = meta;
-}
-
+}
\ No newline at end of file
diff --git a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.h b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.h
index c0d5ba832..984e66092 100644
--- a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.h
+++ b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.h
@@ -659,12 +659,4 @@ public:
 											MaterialFeatureData *outFeatureData );
 };
 
-
-class DeferredSkyGLSL : public ShaderFeatureGLSL
-{
-public:
-   virtual String getName() { return "Deferred Shading: Sky"; }
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
-};
 #endif // _SHADERGEN_GLSL_SHADERFEATUREGLSL_H_
diff --git a/Engine/source/shaderGen/GLSL/shaderGenGLSLInit.cpp b/Engine/source/shaderGen/GLSL/shaderGenGLSLInit.cpp
index 020b68d43..0a14af629 100644
--- a/Engine/source/shaderGen/GLSL/shaderGenGLSLInit.cpp
+++ b/Engine/source/shaderGen/GLSL/shaderGenGLSLInit.cpp
@@ -104,7 +104,7 @@ void _initShaderGenGLSL( ShaderGen *shaderGen )
    FEATUREMGR->registerFeature( MFT_DeferredSpecVars, new DeferredSpecVarsGLSL );
    FEATUREMGR->registerFeature( MFT_DeferredMatInfoFlags, new DeferredMatInfoFlagsGLSL );
    FEATUREMGR->registerFeature( MFT_DeferredEmptySpec, new DeferredEmptySpecGLSL );
-   FEATUREMGR->registerFeature( MFT_SkyBox, new DeferredSkyGLSL );
+   FEATUREMGR->registerFeature( MFT_SkyBox, new NamedFeatureGLSL( "skybox" ) );
 }
 
 MODULE_BEGIN( ShaderGenGLSL )
diff --git a/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp b/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp
index 89260ac2c..22c48ecc5 100644
--- a/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp
+++ b/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp
@@ -2991,16 +2991,3 @@ void ImposterVertFeatureHLSL::determineFeature( Material *material,
       outFeatureData->features.addFeature( MFT_ImposterVert );
 }
 
-
-//****************************************************************************
-// Vertex position
-//****************************************************************************
-void DeferredSkyHLSL::processVert( Vector<ShaderComponent*> &componentList, 
-                                    const MaterialFeatureData &fd )
-{
-   Var *outPosition = (Var*)LangElement::find( "hpos" );
-   MultiLine *meta = new MultiLine;
-   //meta->addStatement( new GenOp( "   @.w = @.z;\r\n", outPosition, outPosition ) );
-
-   output = meta;
-}
diff --git a/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h b/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h
index 673970945..8be2400f5 100644
--- a/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h
+++ b/Engine/source/shaderGen/HLSL/shaderFeatureHLSL.h
@@ -663,13 +663,4 @@ public:
                                   MaterialFeatureData *outFeatureData );
 };
 
-
-class DeferredSkyHLSL : public ShaderFeatureHLSL
-{
-public:
-   virtual String getName() { return "Deferred Shading: Sky"; }
-   virtual void processVert( Vector<ShaderComponent*> &componentList,
-                             const MaterialFeatureData &fd );
-};
-
 #endif // _SHADERGEN_HLSL_SHADERFEATUREHLSL_H_
diff --git a/Engine/source/shaderGen/HLSL/shaderGenHLSLInit.cpp b/Engine/source/shaderGen/HLSL/shaderGenHLSLInit.cpp
index 9e3805cdc..167b4eafe 100644
--- a/Engine/source/shaderGen/HLSL/shaderGenHLSLInit.cpp
+++ b/Engine/source/shaderGen/HLSL/shaderGenHLSLInit.cpp
@@ -106,7 +106,7 @@ void _initShaderGenHLSL( ShaderGen *shaderGen )
    FEATUREMGR->registerFeature( MFT_DeferredSpecVars, new DeferredSpecVarsHLSL );
    FEATUREMGR->registerFeature( MFT_DeferredMatInfoFlags, new DeferredMatInfoFlagsHLSL );
    FEATUREMGR->registerFeature( MFT_DeferredEmptySpec, new DeferredEmptySpecHLSL );
-   FEATUREMGR->registerFeature( MFT_SkyBox, new DeferredSkyHLSL );
+   FEATUREMGR->registerFeature( MFT_SkyBox,  new NamedFeatureHLSL( "skybox" ) );
 }
 
 MODULE_BEGIN( ShaderGenHLSL )