diff --git a/src/modules/graphics/opengl/VertexBuffer.h b/src/modules/graphics/opengl/VertexBuffer.h
index e3a914d8c..22eb5f5e7 100644
--- a/src/modules/graphics/opengl/VertexBuffer.h
+++ b/src/modules/graphics/opengl/VertexBuffer.h
@@ -289,7 +289,7 @@ private:
  *  indices[i*6 + 1] = i*4 + 1;
  *  indices[i*6 + 2] = i*4 + 2;
  *
- *  indices[i*6 + 3] = i*4 + 0;
+ *  indices[i*6 + 3] = i*4 + 1;
  *  indices[i*6 + 4] = i*4 + 2;
  *  indices[i*6 + 5] = i*4 + 3;
  *
diff --git a/src/modules/image/ImageData.cpp b/src/modules/image/ImageData.cpp
index 212432fa3..2dfd2eb48 100644
--- a/src/modules/image/ImageData.cpp
+++ b/src/modules/image/ImageData.cpp
@@ -179,7 +179,6 @@ bool ImageData::getConstant(ImageData::Format in, const char  *&out)
 StringMap<ImageData::Format, ImageData::FORMAT_MAX_ENUM>::Entry ImageData::formatEntries[] =
 {
 	{"tga", ImageData::FORMAT_TGA},
-	{"bmp", ImageData::FORMAT_BMP},
 	{"jpg", ImageData::FORMAT_JPG},
 	{"png", ImageData::FORMAT_PNG},
 };
diff --git a/src/modules/image/ImageData.h b/src/modules/image/ImageData.h
index bbf63417c..ef8ddf773 100644
--- a/src/modules/image/ImageData.h
+++ b/src/modules/image/ImageData.h
@@ -50,7 +50,6 @@ public:
 	enum Format
 	{
 		FORMAT_TGA,
-		FORMAT_BMP,
 		FORMAT_JPG,
 		FORMAT_PNG,
 		FORMAT_MAX_ENUM
diff --git a/src/modules/image/magpie/ImageIOHandler.cpp b/src/modules/image/magpie/ImageIOHandler.cpp
index 771357d8c..1c26ea8a4 100644
--- a/src/modules/image/magpie/ImageIOHandler.cpp
+++ b/src/modules/image/magpie/ImageIOHandler.cpp
@@ -55,8 +55,6 @@ static CFStringRef getFormatType(ImageData::Format format)
 {
 	switch (format)
 	{
-	case ImageData::FORMAT_BMP:
-		return kUTTypeBMP;
 	case ImageData::FORMAT_JPG:
 		return kUTTypeJPEG;
 	case ImageData::FORMAT_TGA: