diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 77a173773..4b969cbd7 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -801,7 +801,7 @@ rebuild_binding_table (MetaKeyBindingManager *keys,
         {
           MetaKeyCombo *combo = tmp->data;
 
-          if (combo && (combo->keysym != None || combo->keycode != 0))
+          if (combo && (combo->keysym != 0 || combo->keycode != 0))
             {
               MetaKeyHandler *handler = HANDLER (pref->name);
 
@@ -824,7 +824,7 @@ rebuild_binding_table (MetaKeyBindingManager *keys,
   while (g)
     {
       MetaKeyGrab *grab = (MetaKeyGrab*)g->data;
-      if (grab->combo.keysym != None || grab->combo.keycode != 0)
+      if (grab->combo.keysym != 0 || grab->combo.keycode != 0)
         {
           MetaKeyHandler *handler = HANDLER ("external-grab");
 
diff --git a/src/core/stack-tracker.c b/src/core/stack-tracker.c
index 21da29af9..2de4444e6 100644
--- a/src/core/stack-tracker.c
+++ b/src/core/stack-tracker.c
@@ -1261,7 +1261,7 @@ void
 meta_stack_tracker_lower (MetaStackTracker *tracker,
                           guint64           window)
 {
-  meta_stack_tracker_raise_above (tracker, window, None);
+  meta_stack_tracker_raise_above (tracker, window, 0);
 }
 
 static void