diff --git a/dix/devices.c b/dix/devices.c
index 6c177863c..42eebf104 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -2040,7 +2040,7 @@ GetPairedKeyboard(DeviceIntPtr ptr)
 
     while(dev)
     {
-        if (ptr->pSprite == dev->pSprite)
+        if (ptr != dev && ptr->pSprite == dev->pSprite)
             return dev;
         dev = dev->next;
     }
diff --git a/dix/window.c b/dix/window.c
index 6c3558343..38bd74fe7 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -3721,6 +3721,7 @@ MakeWindowOptional (register WindowPtr pWin)
     optional->access.ndeny = 0;
     optional->access.perm = NULL;
     optional->access.deny = NULL;
+    optional->access.defaultRule = 0;
     parentOptional = FindWindowWithOptional(pWin)->optional;
     optional->visual = parentOptional->visual;
     if (!pWin->cursorIsNone)