diff --git a/stella/src/emucore/FrameBuffer.cxx b/stella/src/emucore/FrameBuffer.cxx
index b9c8f1e90..00101f600 100644
--- a/stella/src/emucore/FrameBuffer.cxx
+++ b/stella/src/emucore/FrameBuffer.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: FrameBuffer.cxx,v 1.103 2006-12-03 01:13:45 stephena Exp $
+// $Id: FrameBuffer.cxx,v 1.104 2006-12-03 01:24:34 stephena Exp $
 //============================================================================
 
 #include <sstream>
@@ -71,28 +71,24 @@ void FrameBuffer::initialize(const string& title, uInt32 width, uInt32 height,
 
     if(SDL_Init(initflags) < 0)
       return;
-
-    // Set window title and icon
-    setWindowTitle(title);
-    setWindowIcon();
-
-    // Query the desktop size
-    // This is really the job of SDL
-    int dwidth = 0, dheight = 0;
-    myOSystem->getScreenDimensions(dwidth, dheight);
-    myDesktopDim.w = dwidth;  myDesktopDim.h = dheight;
-
-    // Set fullscreen flag
-    mySDLFlags = myOSystem->settings().getBool("fullscreen") ? SDL_FULLSCREEN : 0;
-
-    // Get the aspect ratio for the display if it's been enabled
-    theAspectRatio = 1.0;
-    if(useAspect) setAspectRatio();
   }
 
   // Erase old contents
   cls();
 
+  // Query the desktop size
+  // This is really the job of SDL
+  int dwidth = 0, dheight = 0;
+  myOSystem->getScreenDimensions(dwidth, dheight);
+  myDesktopDim.w = dwidth;  myDesktopDim.h = dheight;
+
+  // Get the aspect ratio for the display if it's been enabled
+  theAspectRatio = 1.0;
+  if(useAspect) setAspectRatio();
+
+  // Set fullscreen flag
+  mySDLFlags = myOSystem->settings().getBool("fullscreen") ? SDL_FULLSCREEN : 0;
+
   // Set the available scalers for this framebuffer, based on current eventhandler
   // state and the maximum size of a window for the current desktop
   setAvailableScalers();
@@ -103,6 +99,10 @@ void FrameBuffer::initialize(const string& title, uInt32 width, uInt32 height,
   setScaler(scaler);
   initSubsystem();
 
+  // Set window title and icon
+  setWindowTitle(title);
+  setWindowIcon();
+
   // And refresh the display
   myOSystem->eventHandler().refreshDisplay();
 
diff --git a/stella/src/gui/LauncherDialog.cxx b/stella/src/gui/LauncherDialog.cxx
index 96dd92172..f53799861 100644
--- a/stella/src/gui/LauncherDialog.cxx
+++ b/stella/src/gui/LauncherDialog.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: LauncherDialog.cxx,v 1.58 2006-12-02 23:25:55 stephena Exp $
+// $Id: LauncherDialog.cxx,v 1.59 2006-12-03 01:24:34 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -154,7 +154,6 @@ LauncherDialog::LauncherDialog(OSystem* osystem, DialogContainer* parent,
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 LauncherDialog::~LauncherDialog()
 {
-cerr << "LauncherDialog::~LauncherDialog()\n";
   delete myOptions;
   delete myGameList;
 }