diff --git a/src/common/FBSurfaceGL.cxx b/src/common/FBSurfaceGL.cxx
index 2bed848e1..f8ad3121a 100644
--- a/src/common/FBSurfaceGL.cxx
+++ b/src/common/FBSurfaceGL.cxx
@@ -220,7 +220,7 @@ void FBSurfaceGL::setWidth(uInt32 w)
   // and it's the only thing that uses it
   if(myImageW != w)
   {
-    myImageW = w;
+    myImageW = BSPF_min(w, (uInt32)myTexWidth);
     myTexCoordW = (GLfloat) myImageW / myTexWidth;
     updateCoords();
   }
@@ -234,7 +234,7 @@ void FBSurfaceGL::setHeight(uInt32 h)
   // and it's the only thing that uses it
   if(myImageH != h)
   {
-    myImageH = h;
+    myImageH = BSPF_min(h, (uInt32)myTexHeight);
     myTexCoordH = (GLfloat) myImageH / myTexHeight;
     updateCoords();
   }
diff --git a/src/common/FrameBufferSoft.cxx b/src/common/FrameBufferSoft.cxx
index cf11ae102..e2a323ff7 100644
--- a/src/common/FrameBufferSoft.cxx
+++ b/src/common/FrameBufferSoft.cxx
@@ -802,13 +802,13 @@ void FBSurfaceSoft::setPos(uInt32 x, uInt32 y)
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void FBSurfaceSoft::setWidth(uInt32 w)
 {
-  myWidth = w;
+  myWidth = BSPF_min(w, (uInt32)mySurface->w);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void FBSurfaceSoft::setHeight(uInt32 h)
 {
-  myHeight = h;
+  myHeight = BSPF_min(h, (uInt32)mySurface->h);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/common/Version.hxx b/src/common/Version.hxx
index 0b1b52921..8f763fb4e 100644
--- a/src/common/Version.hxx
+++ b/src/common/Version.hxx
@@ -22,7 +22,7 @@
 
 #include <cstdlib>
 
-#define STELLA_VERSION "3.7.2"
+#define STELLA_VERSION "3.7.3_svn"
 #define STELLA_BUILD atoi("$Rev$" + 6)
 
 #endif
diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx
index 722eea4b0..adf002552 100644
--- a/src/emucore/FrameBuffer.cxx
+++ b/src/emucore/FrameBuffer.cxx
@@ -180,7 +180,7 @@ FBInitStatus FrameBuffer::initialize(const string& title,
   }
   if(myMsg.surface == NULL)
   {
-    myMsg.surfaceID = allocateSurface(500, myOSystem->font().getFontHeight()+10);
+    myMsg.surfaceID = allocateSurface(640, myOSystem->font().getFontHeight()+10);
     myMsg.surface   = surface(myMsg.surfaceID);
   }