diff --git a/src/modules/graphics/Image.cpp b/src/modules/graphics/Image.cpp
index ee4eb3053..c2fc3a460 100644
--- a/src/modules/graphics/Image.cpp
+++ b/src/modules/graphics/Image.cpp
@@ -24,6 +24,14 @@ namespace love
 {
 namespace graphics
 {
+	Image::Filter::Filter() : min(FILTER_LINEAR), mag(FILTER_LINEAR)
+	{
+	}
+
+	Image::Wrap::Wrap() : s(WRAP_CLAMP), t(WRAP_CLAMP)
+	{
+	}
+
 	Image::~Image()
 	{
 	}
diff --git a/src/modules/graphics/Image.h b/src/modules/graphics/Image.h
index bd9ba311b..79a2ce94a 100644
--- a/src/modules/graphics/Image.h
+++ b/src/modules/graphics/Image.h
@@ -51,12 +51,14 @@ namespace graphics
 
 		struct Filter
 		{
+			Filter();
 			FilterMode min;
 			FilterMode mag;
 		};
 
 		struct Wrap
 		{
+			Wrap();
 			WrapMode s;
 			WrapMode t;
 		};
diff --git a/src/modules/graphics/opengl/Image.cpp b/src/modules/graphics/opengl/Image.cpp
index 7cd954b25..a45b5fd5c 100644
--- a/src/modules/graphics/opengl/Image.cpp
+++ b/src/modules/graphics/opengl/Image.cpp
@@ -198,7 +198,7 @@ namespace opengl
 		switch(w.s)
 		{
 		case WRAP_CLAMP:
-			gs = GL_CLAMP;
+			gs = GL_CLAMP_TO_EDGE;
 			break;
 		case WRAP_REPEAT:
 		default:
@@ -209,7 +209,7 @@ namespace opengl
 		switch(w.t)
 		{
 		case WRAP_CLAMP:
-			gt = GL_CLAMP;
+			gt = GL_CLAMP_TO_EDGE;
 			break;
 		case WRAP_REPEAT:
 		default:
@@ -236,7 +236,7 @@ namespace opengl
 
 		switch(gs)
 		{
-		case GL_CLAMP:
+		case GL_CLAMP_TO_EDGE:
 			w.s = WRAP_CLAMP;
 			break;
 		case GL_REPEAT:
@@ -247,7 +247,7 @@ namespace opengl
 
 		switch(gt)
 		{
-		case GL_CLAMP:
+		case GL_CLAMP_TO_EDGE:
 			w.t = WRAP_CLAMP;
 			break;
 		case GL_REPEAT: