diff --git a/src/main/java/com/samskivert/swing/ComboButtonBox.java b/src/main/java/com/samskivert/swing/ComboButtonBox.java
index 61eaff51..79fe4dc8 100644
--- a/src/main/java/com/samskivert/swing/ComboButtonBox.java
+++ b/src/main/java/com/samskivert/swing/ComboButtonBox.java
@@ -40,7 +40,7 @@ public class ComboButtonBox extends JPanel
      */
     public ComboButtonBox (int orientation)
     {
-        this(orientation, new DefaultComboBoxModel());
+        this(orientation, new DefaultComboBoxModel<Object>());
     }
 
     /**
@@ -49,7 +49,7 @@ public class ComboButtonBox extends JPanel
      * be used to populate the buttons (see {@link #setModel} for more
      * details).
      */
-    public ComboButtonBox (int orientation, ComboBoxModel model)
+    public ComboButtonBox (int orientation, ComboBoxModel<?> model)
     {
         // set up our layout
         setOrientation(orientation);
@@ -76,7 +76,7 @@ public class ComboButtonBox extends JPanel
      * icons for the buttons. Otherwise the button text will contain the
      * string representation of the elements in the model.
      */
-    public void setModel (ComboBoxModel model)
+    public void setModel (ComboBoxModel<?> model)
     {
         // if we had a previous model, unregister ourselves from it
         if (_model != null) {
@@ -106,7 +106,7 @@ public class ComboButtonBox extends JPanel
     /**
      * Returns the model in use by the button box.
      */
-    public ComboBoxModel getModel ()
+    public ComboBoxModel<?> getModel ()
     {
         return _model;
     }
@@ -369,7 +369,7 @@ public class ComboButtonBox extends JPanel
     }
 
     /** The contents of the box. */
-    protected ComboBoxModel _model;
+    protected ComboBoxModel<?> _model;
 
     /** The index of the selected button. */
     protected int _selectedIndex = -1;
diff --git a/src/main/java/com/samskivert/swing/RuntimeAdjust.java b/src/main/java/com/samskivert/swing/RuntimeAdjust.java
index 507d407b..acbfdf5e 100644
--- a/src/main/java/com/samskivert/swing/RuntimeAdjust.java
+++ b/src/main/java/com/samskivert/swing/RuntimeAdjust.java
@@ -304,7 +304,7 @@ public class RuntimeAdjust
 
         @Override protected void populateEditor (JPanel editor)
         {
-            editor.add(_valbox = new JComboBox(_values), GroupLayout.FIXED);
+            editor.add(_valbox = new JComboBox<Object>(_values), GroupLayout.FIXED);
             _valbox.addActionListener(this);
             _valbox.setSelectedItem(getValue());
         }
@@ -330,7 +330,7 @@ public class RuntimeAdjust
 
         protected String _value;
         protected String[] _values;
-        protected JComboBox _valbox;
+        protected JComboBox<Object> _valbox;
     }
 
     /** Provides runtime adjustable file path variables. */