diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index a31707912b..ab5e8d6612 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -318,7 +318,7 @@ class MessagePanel(wx.Panel):
         box.Add((10,10), 2)
 
         self.SetSizer(box)
-        
+        self.Fit()
         
 
 #---------------------------------------------------------------------------
diff --git a/wxPython/demo/MediaCtrl.py b/wxPython/demo/MediaCtrl.py
index 24f333507d..fe9cb74185 100644
--- a/wxPython/demo/MediaCtrl.py
+++ b/wxPython/demo/MediaCtrl.py
@@ -14,7 +14,11 @@ class TestPanel(wx.Panel):
                           style=wx.TAB_TRAVERSAL|wx.CLIP_CHILDREN)
 
         # Create some controls
-        self.mc = wx.media.MediaCtrl(self, style=wx.SIMPLE_BORDER)
+        try:
+            self.mc = wx.media.MediaCtrl(self, style=wx.SIMPLE_BORDER)
+        except NotImplementedError:
+            self.Destroy()
+            raise
 
         btn1 = wx.Button(self, -1, "Load File")
         self.Bind(wx.EVT_BUTTON, self.OnLoadFile, btn1)