diff --git a/demo/Main.py b/demo/Main.py
index fc641a02..79364bfc 100644
--- a/demo/Main.py
+++ b/demo/Main.py
@@ -1354,7 +1354,7 @@ class DemoTaskBarIcon(TaskBarIcon):
         elif "wxGTK" in wx.PlatformInfo:
             img = img.Scale(22, 22)
         # wxMac can be any size upto 128x128, so leave the source img alone....
-        icon = wx.IconFromBitmap(img.ConvertToBitmap())
+        icon = wx.Icon(img.ConvertToBitmap())
         return icon
 
 
diff --git a/etg/grid.py b/etg/grid.py
index 94e6c575..36f8eeaf 100644
--- a/etg/grid.py
+++ b/etg/grid.py
@@ -467,10 +467,10 @@ def run():
 
     # But also keep aliases for the old names, just in case
     c.addPyCode("""\
-        Grid.GridSelectCells = Grid.SelectCells
-        Grid.GridSelectRows = Grid.SelectRows
-        Grid.GridSelectColumns = Grid.SelectColumns
-        Grid.GridSelectRowsOrColumns = Grid.SelectRowsOrColumns
+        Grid.wxGridSelectCells = Grid.SelectCells
+        Grid.wxGridSelectRows = Grid.SelectRows
+        Grid.wxGridSelectColumns = Grid.SelectColumns
+        Grid.wxGridSelectRowsOrColumns = Grid.SelectRowsOrColumns
         """)
 
     #-----------------------------------------------------------------
diff --git a/unittests/test_window.py b/unittests/test_window.py
index 747e89cb..de9ccec1 100644
--- a/unittests/test_window.py
+++ b/unittests/test_window.py
@@ -122,6 +122,12 @@ class WindowTests(wtc.WidgetTestCase):
         val = self.frame.DLG_UNIT((10, 10))
         _check(val)
 
+        val = wx.DLG_UNIT(self.frame, wx.Point(10, 10))
+        assert isinstance(val, wx.Point)
+        
+        val = wx.DLG_UNIT(self.frame, wx.Size(10, 10))
+        assert isinstance(val, wx.Size)
+        
         wx.DLG_SZE
         wx.DLG_PNT