diff --git a/objects/ui2/canvas.self b/objects/ui2/canvas.self
index e1ca2124..0b3eb570 100644
--- a/objects/ui2/canvas.self
+++ b/objects/ui2/canvas.self
@@ -2186,6 +2186,13 @@ the pixmapCache some day.
          pixmap <- bootstrap stub -> 'globals' -> 'quartzGlobals' -> 'bufferCanvas' -> ().
         } | ) 
 
+ bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'quartzWindowCanvas' -> () From: ( | {
+         'Category: portable accessing\x7fModuleInfo: Module: canvas InitialContents: FollowSlot\x7fVisibility: public'
+        
+         scalableFont = ( |
+            | x11Globals scalableFont).
+        } | ) 
+
  bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'xPixmapCanvas' -> () From: ( | {
          'Category: converting ui2Image\'s\x7fModuleInfo: Module: canvas InitialContents: FollowSlot\x7fVisibility: public'
         
diff --git a/objects/ui2/propertySheets.self b/objects/ui2/propertySheets.self
index cf56629a..d6b6ef61 100644
--- a/objects/ui2/propertySheets.self
+++ b/objects/ui2/propertySheets.self
@@ -1,7 +1,7 @@
  '$Revision: 30.11 $'
  '
-Copyright 1992-2012 AUTHORS.
-See the LICENSE file for license information.
+Copyright 1992-2011 AUTHORS.
+See the legal/LICENSE file for license information and legal/AUTHORS for authors.
 '
 
 
@@ -116,7 +116,7 @@ SlotsToOmit: parent prototype.
             | 
             defaultButtonHolder: ui2Menu initializeDefaultButtonHolder: defaultButtonHolder.
             f: enumeratedTypeLabelMorph copyItemNames: labels Values: values DefaultButtonHolder: defaultButtonHolder.
-            f setSelectedIndex: (values asVector keyAt: v).
+            f setSelectedIndex: (values asVector keyAt: v IfAbsent: [ values asVector keyAt: 'defaultFont']).
             f fontSpec: globals fontSpec copyName: 'verdana' Size: outlinerPreferences mediumFontSize Style: 'bold'.
             buildFieldLabel: n ContentMorph: f).
         } | ) 
@@ -690,7 +690,7 @@ SlotsToOmit: parent prototype.
  bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'borderPropsMorph' -> () From: ( | {
          'Category: property specifics\x7fModuleInfo: Module: propertySheets InitialContents: InitializeToExpression: (nil)\x7fVisibility: private'
         
-         defaultButtonHolder.
+         defaultButtonHolder <- bootstrap stub -> 'globals' -> 'nil' -> ().
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'borderPropsMorph' -> () From: ( | {
@@ -886,7 +886,7 @@ SlotsToOmit: parent prototype.
  bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'labelPropsMorph' -> () From: ( | {
          'Category: property specifics\x7fModuleInfo: Module: propertySheets InitialContents: InitializeToExpression: (nil)\x7fVisibility: private'
         
-         defaultButtonHolder.
+         defaultButtonHolder <- bootstrap stub -> 'globals' -> 'nil' -> ().
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'labelPropsMorph' -> () From: ( | {
@@ -1119,7 +1119,7 @@ SlotsToOmit: parent prototype.
  bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'resizingPropsMorph' -> () From: ( | {
          'Category: property specifics\x7fModuleInfo: Module: propertySheets InitialContents: InitializeToExpression: (nil)\x7fVisibility: private'
         
-         defaultButtonHolder.
+         defaultButtonHolder <- bootstrap stub -> 'globals' -> 'nil' -> ().
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'resizingPropsMorph' -> () From: ( | {
diff --git a/objects/ui2/scalableFont.self b/objects/ui2/scalableFont.self
index 22a294b7..0ebcd908 100644
--- a/objects/ui2/scalableFont.self
+++ b/objects/ui2/scalableFont.self
@@ -236,6 +236,13 @@ SlotsToOmit: comment directory fileInTimeString myComment postFileIn revision su
          courierItalic = '-*-courier-medium-o-normal--'.
         } | ) 
 
+ bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'x11Globals' -> 'fontFamily' -> () From: ( | {
+         'Category: font substituion\x7fComment: Return font to be used for fonts that can\'t be found.\x7fModuleInfo: Module: scalableFont InitialContents: FollowSlot\x7fVisibility: public'
+        
+         defaultFont = ( |
+            | times).
+        } | ) 
+
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'x11Globals' -> 'fontFamily' -> () From: ( | {
          'ModuleInfo: Module: scalableFont InitialContents: FollowSlot'
         
@@ -560,7 +567,7 @@ I print out as asterisks.\x7fModuleInfo: Module: scalableFont InitialContents: F
               lastKvetchTime: now.
               ('unknown font: ', sel) printLine.
             ].
-            times).
+            defaultFont).
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'x11Globals' -> 'fontFamily' -> () From: ( | {
@@ -587,6 +594,12 @@ I print out as asterisks.\x7fModuleInfo: Module: scalableFont InitialContents: F
          urwAvantGardeItalic = '-*-itc avant garde-medium-o-normal-sans-'.
         } | ) 
 
+ bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'x11Globals' -> 'fontFamily' -> () From: ( | {
+         'ModuleInfo: Module: scalableFont InitialContents: FollowSlot'
+        
+         verdana = '-*-verdana-medium-r-normal-sans-'.
+        } | ) 
+
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'x11Globals' -> 'fontFamily' -> () From: ( | {
          'ModuleInfo: Module: scalableFont InitialContents: FollowSlot'
         
@@ -661,6 +674,9 @@ I print out as asterisks.\x7fModuleInfo: Module: scalableFont InitialContents: F
             (reflect: x11Globals fontFamily) do: [| :slot. :name | names add: name ].
             names remove: 'parent'.
             names remove: 'aNoteAboutMacXFonts'.
+            names remove: 'undefinedSelector:Type:Delegatee:MethodHolder:Arguments:'.
+            names remove: 'lastKvetchTime'.
+            names remove: 'lastKvetchTime:'.
             names asVector sort).
         } | )