diff --git a/include/ACGL/OpenGL/Debug.hh b/include/ACGL/OpenGL/Debug.hh
index 893980d06a133b20d765b3c9e08a031b009b141e..4f8e3e140e9d5960aba13996f145440b15c880ac 100644
--- a/include/ACGL/OpenGL/Debug.hh
+++ b/include/ACGL/OpenGL/Debug.hh
@@ -33,6 +33,7 @@ public:
 // GL_TRANSFORM_FEEDBACK, GL_SAMPLER, GL_TEXTURE, GL_RENDERBUFFER or GL_FRAMEBUFFER
 template <unsigned int THE_GL_TYPE>
 void setObjectLabelT( GLuint _objectName, const std::string &_label ) {
+    //ACGL::Utils::debug() << "label " << _objectName << " as " << _label << std::endl;
     glObjectLabel( THE_GL_TYPE, _objectName, -1, _label.c_str() );
 }
 
diff --git a/src/ACGL/OpenGL/Objects/Shader.cc b/src/ACGL/OpenGL/Objects/Shader.cc
index 5bd3ecbebb052aac913613ce0723bec91f94ae59..2e7f8854fb554d20ed10dedb5df7d39df0fb059a 100644
--- a/src/ACGL/OpenGL/Objects/Shader.cc
+++ b/src/ACGL/OpenGL/Objects/Shader.cc
@@ -70,7 +70,7 @@ bool Shader::setFromFile(SharedShaderParser const& _sp)
         }
     }
 
-    setObjectLabel( _sp->getSources()[0].c_str() );
+    setObjectLabel( _sp->getFileName(0).c_str() );
 
     return !compileErrors; // return true iff there were no errors
 }
diff --git a/src/nv_dds/nv_dds.cpp b/src/nv_dds/nv_dds.cpp
index d6fb492d367a692843a077cd82bde8e4037ef925..60511b7094707c204e77953ea24f129714597936 100644
--- a/src/nv_dds/nv_dds.cpp
+++ b/src/nv_dds/nv_dds.cpp
@@ -1058,7 +1058,7 @@ void CDDSImage::flip_dxt5_alpha(DXT5AlphaBlock *block)
     uint8_t gBits[4][4];
     
     const uint32_t mask = 0x00000007;          // bits = 00 00 01 11
-    uint16_t bits = 0;
+    uint32_t bits = 0;
     memcpy(&bits, &block->row[0], sizeof(uint8_t) * 3);
 
     gBits[0][0] = (uint8_t)(bits & mask);