diff --git a/swig-interfaces/FXApp.i b/swig-interfaces/FXApp.i
index 0889ebc00a4fd892401c82703f34f9a5021348cd..89f7d7994afb922ec6c6e0525c3bb1efbbc265eb 100644
--- a/swig-interfaces/FXApp.i
+++ b/swig-interfaces/FXApp.i
@@ -464,7 +464,7 @@ public:
   * Run popup menu while shown, until stop() or stopModal() is called.
   * Also returns when entering previous cascading popup menu.
   */
-  FXint runPopup(FXWindow* window);
+  FXint runPopup(FXWindow* owner);
 
   /// True if the window is modal
   bool isModal(FXWindow* window) const;
diff --git a/swig-interfaces/FXSplashWindow.i b/swig-interfaces/FXSplashWindow.i
index 79f671fa7a22ddcb8bf5fddb43c62758247bd8e7..02c59cff7f63e3aebc5846b539cc30ef96667b68 100644
--- a/swig-interfaces/FXSplashWindow.i
+++ b/swig-interfaces/FXSplashWindow.i
@@ -53,10 +53,10 @@ public:
 public:
 
   /// Construct splash window
-  FXSplashWindow(FXApp* ap,FXIcon* ic,FXuint opts=SPLASH_SIMPLE,FXuint ms=5000);
+  FXSplashWindow(FXApp* a,FXIcon* ic,FXuint opts=SPLASH_SIMPLE,FXuint ms=5000);
 
   /// Construct splash window
-  FXSplashWindow(FXWindow* ow,FXIcon* ic,FXuint opts=SPLASH_SIMPLE,FXuint ms=5000);
+  FXSplashWindow(FXWindow* own,FXIcon* ic,FXuint opts=SPLASH_SIMPLE,FXuint ms=5000);
 
   /// Set the icon for the splash window
   void setIcon(FXIcon* ic);
diff --git a/swig-interfaces/ruby-typemaps.i b/swig-interfaces/ruby-typemaps.i
index d59085df476002aa9cdb30c2967a9870ab7b48ac..109aee5803603ae1e0b8135f796566a4f26f3982 100644
--- a/swig-interfaces/ruby-typemaps.i
+++ b/swig-interfaces/ruby-typemaps.i
@@ -24,8 +24,14 @@
 
 %apply Pointer NONNULL {
   FXApp* APP,
-	FXComposite* PARENT,
-	FXWindow* OWNER
+  FXApp* a,
+  FXApp* app,
+  FXApp* application,
+  FXComposite* PARENT,
+  FXComposite* p,
+  FXWindow* OWNER,
+  FXWindow* own,
+  FXWindow* owner
 }
 
 /* Type-checking rules */
diff --git a/test/TC_FXApp.rb b/test/TC_FXApp.rb
index 555e41c40b1c07488cdd93b08c583c6f59fa018c..75010176f8b28a66c611fc53a64aa225838cd619 100755
--- a/test/TC_FXApp.rb
+++ b/test/TC_FXApp.rb
@@ -23,6 +23,10 @@ class TC_FXApp2 < Fox::TestCase
     super(self.class.name)
   end
 
+  def test_nil_window_raises_argument_error
+    assert_raise(ArgumentError){ app.runPopup(nil) }
+  end
+
   def check_events(pipe_rd, pipe_wr)
     app.addInput(pipe_wr, INPUT_WRITE, app, FXApp::ID_QUIT)
     app.run
diff --git a/test/TC_FXButton.rb b/test/TC_FXButton.rb
index bd0127b41b77befa999f041c124eef81a02caef5..425076c69688ab575828e8cb671268d2b3790cfa 100755
--- a/test/TC_FXButton.rb
+++ b/test/TC_FXButton.rb
@@ -10,6 +10,10 @@ class TC_FXButton < Fox::TestCase
     @button = FXButton.new(mainWindow, "buttonText")
   end
 
+  def test_nil_parent_raises_argument_error
+    assert_raise(ArgumentError){ FXButton.new(nil, "buttonText") }
+  end
+
   def testText
     assert(@button.text)
     assert_instance_of(String, @button.text)
diff --git a/test/TC_FXGLViewer.rb b/test/TC_FXGLViewer.rb
index 36fd5ad2b789c817b3790651a9d26f5155a23710..dede2a4922d2bd091cd76e8483614cf29adfe19b 100755
--- a/test/TC_FXGLViewer.rb
+++ b/test/TC_FXGLViewer.rb
@@ -10,6 +10,15 @@ class TC_FXGLViewer < Fox::TestCase
     vis = FXGLVisual.new(app, VISUAL_DOUBLEBUFFER)
     @viewer = FXGLViewer.new(mainWindow, vis)
   end
+
+  def test_supported
+    assert FXGLVisual.supported?(app)
+  end
+
+  def test_nil_app_raises_argument_error
+    assert_raise(ArgumentError){ FXGLVisual.supported?(nil) }
+  end
+
 =begin
   def test_readPixels
     pixels = @viewer.readPixels(0, 0, @viewer.width, @viewer.height)
diff --git a/test/TC_FXMessageBox.rb b/test/TC_FXMessageBox.rb
index 372d2b136aa3721b52a0fff6e31e5f03bb1fbfb8..dfc9e218b725c968c56768e25e78636b83627283 100755
--- a/test/TC_FXMessageBox.rb
+++ b/test/TC_FXMessageBox.rb
@@ -9,6 +9,10 @@ class TC_FXMessageBox < Fox::TestCase
     super(self.class.name)
   end
 
+  def test_nil_app_raises_argument_error
+    assert_raise(ArgumentError){ FXMessageBox.new(nil, "Save?", "Save?", :opts => MBOX_SAVE_CANCEL_DONTSAVE) }
+  end
+
   def test_construct_with_save_cancel_dontsave
     assert_nothing_raised(RangeError) do
       FXMessageBox.new(mainWindow, "Save?", "Save?", :opts => MBOX_SAVE_CANCEL_DONTSAVE)
diff --git a/test/TC_FXScrollArea.rb b/test/TC_FXScrollArea.rb
index 23546cb7258ad47b4ebf390be332a85c820850d8..1c549e97af52f86c65bd542e70607b155e06db12 100755
--- a/test/TC_FXScrollArea.rb
+++ b/test/TC_FXScrollArea.rb
@@ -10,6 +10,10 @@ class TC_FXScrollArea < Fox::TestCase
     @scrollArea = FXScrollArea.new(mainWindow)
   end
 
+  def test_nil_parent_raises_argument_error
+    assert_raise(ArgumentError){ FXScrollArea.new(nil) }
+  end
+
   def test_position_get
     pos = @scrollArea.position
     assert_instance_of(Array, pos)
diff --git a/test/TC_FXShell.rb b/test/TC_FXShell.rb
index 08be5432d2b6a667028064399ee209f53971cb84..89391aa9243ed9961f35c8e2e1eabf8e4c402793 100755
--- a/test/TC_FXShell.rb
+++ b/test/TC_FXShell.rb
@@ -15,6 +15,10 @@ class TC_FXShell < Test::Unit::TestCase
     @mainWin = FXMainWindow.new(@app, 'TC_FXShell')
   end
 
+  def test_nil_parent_raises_argument_error
+    assert_raise(ArgumentError){ FXShell.new(nil, 0, 0, 0, 0, 0) }
+  end
+
   def test_new
     # Free-floating
     shell1 = FXShell.new(@app, 0, 0, 0, 0, 0)
diff --git a/test/TC_FXTopWindow.rb b/test/TC_FXTopWindow.rb
index 022897bf42b7928f0451d0f0df9184e7d482e273..97eb690faa7ad2d51cabc7c69a0bb380b8ca7ea3 100755
--- a/test/TC_FXTopWindow.rb
+++ b/test/TC_FXTopWindow.rb
@@ -15,6 +15,10 @@ class TC_FXTopWindow < Test::Unit::TestCase
     @mainWin = FXMainWindow.new(@app, 'TC_FXButton')
   end
 
+  def test_nil_app_raises_argument_error
+    assert_raise(ArgumentError){ FXTopWindow.new(nil, 'TC_FXButton') }
+  end
+
   def test_new
     # Free-floating
     top1 = FXTopWindow.new(@app, "top1", nil, nil, DECOR_ALL, 0, 0, 0, 0,