diff --git a/Aquaria/DSQ.cpp b/Aquaria/DSQ.cpp
index 4d18f79..59ac59c 100644
--- a/Aquaria/DSQ.cpp
+++ b/Aquaria/DSQ.cpp
@@ -561,7 +561,7 @@ void DSQ::takeScreenshotKey()
 		screenshot();
 }
 
-Quad *loading=0;
+static Quad *loading=0;
 
 float loadingProgress = 0;
 static const float loadingProgressTable[] = {
diff --git a/BBGE/FrameBuffer.cpp b/BBGE/FrameBuffer.cpp
index cc78ccb..48b29fb 100644
--- a/BBGE/FrameBuffer.cpp
+++ b/BBGE/FrameBuffer.cpp
@@ -134,7 +134,7 @@ bool FrameBuffer::init(int width, int height, unsigned pages)
 	glGenFramebuffersEXT(_numfbos, &_fbos[0]);
 	for(unsigned i = 0; i < _numfbos; ++i)
 		if(!_fbos[i])
-			return false;
+			goto out;
 
 	if(_numfbos == 1)
 		glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, _fbos[0] );
@@ -177,13 +177,17 @@ bool FrameBuffer::init(int width, int height, unsigned pages)
 			debugLog("GL_FRAMEBUFFER_UNSUPPORTED_EXT!");
 		default:
 			unloadDevice();
-			return false;
+			goto out;
 		}
 	}
 
 	debugLog("Done");
 	inited = true;
-	return true;
+
+out:
+	glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+	return inited;
+
 }
 
 void FrameBuffer::unloadDevice()