diff --git a/source/gameengine/Ketsji/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp
index 6841bb2f959..4a5a426e9e8 100644
--- a/source/gameengine/Ketsji/BL_Texture.cpp
+++ b/source/gameengine/Ketsji/BL_Texture.cpp
@@ -248,7 +248,7 @@ bool BL_Texture::InitCubeMap(int unit,  EnvMap *cubemap)
 	BL_TextureObject obj;
 	obj.gl_texture = mTexture;
 	obj.ref_buffer = cubemap->ima;
-	g_textureManager.insert(std::make_pair(cubemap->ima->id.name, obj));
+	g_textureManager.insert(std::pair<char*, BL_TextureObject>((char*)cubemap->ima->id.name, obj));
 
 
 	bool needs_split = false;
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
index 8014c4ebd2a..c8ed2dd6960 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
@@ -191,7 +191,7 @@ static void bglInitEntryPoints (void)
 	{
 		if (!libGL)
 		{
-			libGL = dlopen("libGL.so", RTLD_GLOBAL);
+			libGL = dlopen("libGL.so", RTLD_LAZY|RTLD_GLOBAL);
 			if (libGL)
 				bglGetProcAddress = (PFNBGLXGETPROCADDRESSARBPROC) (dlsym(libGL, "glXGetProcAddressARB"));
 			else