diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx
index 4338cf820..4145b2892 100644
--- a/src/emucore/FrameBuffer.cxx
+++ b/src/emucore/FrameBuffer.cxx
@@ -46,13 +46,12 @@ FrameBuffer::FrameBuffer(OSystem& osystem)
   : myOSystem(osystem),
     myInitializedCount(0),
     myPausedCount(0),
+    myStatsEnabled(false),
+    myLastFrameRate(60),
     myCurrentModeList(nullptr),
     myTotalTime(0),
-    myTotalFrames(0),
-    myLastFrameRate(60)
+    myTotalFrames(0)
 {
-  myMsg.surface = myStatsMsg.surface = nullptr;
-  myStatsEnabled = myMsg.enabled = myStatsMsg.enabled = false;
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/emucore/FrameBuffer.hxx b/src/emucore/FrameBuffer.hxx
index b49a70c56..eb834815e 100644
--- a/src/emucore/FrameBuffer.hxx
+++ b/src/emucore/FrameBuffer.hxx
@@ -509,6 +509,8 @@ class FrameBuffer
       uInt32 color;
       shared_ptr<FBSurface> surface;
       bool enabled;
+
+      Message() : counter(0), x(0), y(0), w(0), h(0), color(0), enabled(false) { }
     };
     Message myMsg;
     Message myStatsMsg;
@@ -537,7 +539,6 @@ class FrameBuffer
 
     uInt64 myTotalTime;
     uInt64 myTotalFrames;
-    float myLastRunFrameRate;
 
   private:
     // Following constructors and assignment operators not supported