diff --git a/configure b/configure
index f83a38a..579e78d 100755
--- a/configure
+++ b/configure
@@ -18,7 +18,7 @@ fi
 
 
 help=false
-build="Debug"	# release
+build="debug"	# release
 prefix=/usr/local
 
 # Parse the args
@@ -26,8 +26,8 @@ for i in "$@"
 do
 	case $i in
 		--help )				help=true ;;
-		--debug )				build="Debug" ;;
-		--release )				build="Release" ;;
+		--debug )				build="debug" ;;
+		--release )				build="release" ;;
 		--prefix=* )			prefix="${i#--prefix=}" ;;
 		* )						echo "Unrecognised argument $i" ;;
 	esac
diff --git a/src/nvtt/CubeImage.cpp b/src/nvtt/CubeImage.cpp
index 61c229e..668f4a1 100644
--- a/src/nvtt/CubeImage.cpp
+++ b/src/nvtt/CubeImage.cpp
@@ -22,6 +22,7 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 
 #include "CubeImage.h"
+#include "TexImage.h"
 
 using namespace nv;
 using namespace nvtt;
@@ -113,14 +114,14 @@ TexImage CubeImage::unfold(CubeLayout layout)
 void CubeImage::toLinear(float gamma)
 {
     for (int i = 0; i < 6; i++) {
-        m->face.toLinear(gamma);
+        m->face[i].toLinear(gamma);
     }
 }
 
 void CubeImage::toGamma(float gamma)
 {
     for (int i = 0; i < 6; i++) {
-        m->face.toGamma(gamma);
+        m->face[i].toGamma(gamma);
     }
 }
 
diff --git a/src/nvtt/nvtt.h b/src/nvtt/nvtt.h
index e8577b9..3188227 100644
--- a/src/nvtt/nvtt.h
+++ b/src/nvtt/nvtt.h
@@ -536,7 +536,7 @@ namespace nvtt
         TexImage & face(int face);
 
         // Layout conversion.
-        void fold(TexImage & img, CubeLayout layout);
+        void fold(const TexImage & img, CubeLayout layout);
         TexImage unfold(CubeLayout layout);
 
         // @@ Angular extent filtering.