diff --git a/src/nvcore/Debug.cpp b/src/nvcore/Debug.cpp
index 55a10b6..76390fc 100644
--- a/src/nvcore/Debug.cpp
+++ b/src/nvcore/Debug.cpp
@@ -48,7 +48,7 @@
 #	endif
 #endif
 
-//#include <stdexcept> // std::runtime_error
+#include <stdexcept> // std::runtime_error
 #undef assert // defined on mingw
 
 using namespace nv;
@@ -360,8 +360,7 @@ namespace
 			
 			if( ret == NV_ABORT_EXIT ) {
 				// Exit cleanly.
-				//throw std::runtime_error("Assertion failed");
-                throw "Assertion failed";
+				throw std::runtime_error("Assertion failed");
 			}
 			
 			return ret;			
diff --git a/src/nvtt/CMakeLists.txt b/src/nvtt/CMakeLists.txt
index 83f5b7d..9e7a732 100644
--- a/src/nvtt/CMakeLists.txt
+++ b/src/nvtt/CMakeLists.txt
@@ -10,10 +10,10 @@ SET(NVTT_SRCS
 	nvtt_wrapper.h
 	nvtt_wrapper.cpp
 	Compressor.h
-	CompressDXT.h
-	CompressDXT.cpp
-	CompressRGB.h
-	CompressRGB.cpp
+	CompressorDXT.h
+	CompressorDXT.cpp
+	CompressorRGB.h
+	CompressorRGB.cpp
 	QuickCompressDXT.h
 	QuickCompressDXT.cpp
 	OptimalCompressDXT.h
@@ -29,9 +29,9 @@ SET(NVTT_SRCS
 	cuda/CudaUtils.h
 	cuda/CudaUtils.cpp
 	cuda/CudaMath.h
-	cuda/Bitmaps.h
-	cuda/CudaCompressDXT.h
-	cuda/CudaCompressDXT.cpp)
+	cuda/BitmapTable.h
+	cuda/CudaCompressorDXT.h
+	cuda/CudaCompressorDXT.cpp)
 
 IF (CUDA_FOUND)
 	ADD_DEFINITIONS(-DHAVE_CUDA)
diff --git a/src/nvtt/CompressorDXT.cpp b/src/nvtt/CompressorDXT.cpp
index 478f214..5d195f6 100644
--- a/src/nvtt/CompressorDXT.cpp
+++ b/src/nvtt/CompressorDXT.cpp
@@ -71,9 +71,10 @@ typedef ULONG_PTR DWORD_PTR;
 #include "stb/stb_dxt.h"
 #endif
 
-#pragma message(NV_FILE_LINE "FIXME: Define HAVE_OPENMP from cmake.")
-#define HAVE_OPENMP
+// OpenMP
+#if defined(HAVE_OPENMP)
 #include <omp.h>
+#endif
 
 using namespace nv;
 using namespace nvtt;