diff --git a/stella/src/gui/Widget.hxx b/stella/src/gui/Widget.hxx
index 0000fe3f9..c8dff6942 100644
--- a/stella/src/gui/Widget.hxx
+++ b/stella/src/gui/Widget.hxx
@@ -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: Widget.hxx,v 1.10 2005-05-16 00:02:32 stephena Exp $
+// $Id: Widget.hxx,v 1.11 2005-05-18 22:54:01 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -65,7 +65,7 @@ enum {
   This is the base class for all widgets.
   
   @author  Stephen Anthony
-  @version $Id: Widget.hxx,v 1.10 2005-05-16 00:02:32 stephena Exp $
+  @version $Id: Widget.hxx,v 1.11 2005-05-18 22:54:01 stephena Exp $
 */
 class Widget : public GuiObject
 {
@@ -176,8 +176,8 @@ class ButtonWidget : public StaticTextWidget, public CommandSender
     void drawWidget(bool hilite);
 
   protected:
-    uint	_cmd;
-    uInt8	_hotkey;
+    int    _cmd;
+    uInt8  _hotkey;
 };
 
 
diff --git a/stella/src/win32/SettingsWin32.cxx b/stella/src/win32/SettingsWin32.cxx
index 546858a11..d8b78763c 100644
--- a/stella/src/win32/SettingsWin32.cxx
+++ b/stella/src/win32/SettingsWin32.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: SettingsWin32.cxx,v 1.14 2005-05-18 22:35:37 stephena Exp $
+// $Id: SettingsWin32.cxx,v 1.15 2005-05-18 22:54:02 stephena Exp $
 //============================================================================
 
 #include <sstream>
@@ -25,7 +25,8 @@
 #include "SettingsWin32.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-SettingsWin32::SettingsWin32()
+SettingsWin32::SettingsWin32(OSystem* osystem)
+    : Settings(osystem)
 {
   set("video_driver", "windib"); // This seems to be much faster than DirectX
   set("fragsize", "2048");       // Anything less than this usually causes sound skipping