diff --git a/Carbonite.Notes/Carbonite.Notes.toc b/Carbonite.Notes/Carbonite.Notes.toc
index a70fa0a..7c98dfa 100644
--- a/Carbonite.Notes/Carbonite.Notes.toc
+++ b/Carbonite.Notes/Carbonite.Notes.toc
@@ -1,4 +1,4 @@
-## Interface: 40400
+## Interface: 40401
 ## Title: Carbonite Notes @project-version@
 ## Version: @project-version@
 ## Author: No one
diff --git a/Carbonite.Quests/Carbonite.Quests.toc b/Carbonite.Quests/Carbonite.Quests.toc
index c1ff7f5..8f09dfe 100644
--- a/Carbonite.Quests/Carbonite.Quests.toc
+++ b/Carbonite.Quests/Carbonite.Quests.toc
@@ -1,4 +1,4 @@
-## Interface: 40400
+## Interface: 40401
 ## Title: Carbonite Quest - Classic @project-version@
 ## Version: @project-version@
 ## Author: No One
diff --git a/Carbonite.Social/Carbonite.Social.toc b/Carbonite.Social/Carbonite.Social.toc
index de21544..82a1821 100644
--- a/Carbonite.Social/Carbonite.Social.toc
+++ b/Carbonite.Social/Carbonite.Social.toc
@@ -1,4 +1,4 @@
-## Interface: 40400
+## Interface: 40401
 ## Title: Carbonite Social & Punks @project-version@
 ## Version: @project-version@
 ## Author: No One
diff --git a/Carbonite.Warehouse/Carbonite.Warehouse.toc b/Carbonite.Warehouse/Carbonite.Warehouse.toc
index 220b153..919a86d 100644
--- a/Carbonite.Warehouse/Carbonite.Warehouse.toc
+++ b/Carbonite.Warehouse/Carbonite.Warehouse.toc
@@ -1,4 +1,4 @@
-## Interface: 40400
+## Interface: 40401
 ## Title: Carbonite Warehouse @project-version@
 ## Version: @project-version@
 ## Author: No One
diff --git a/Carbonite/Carbonite.toc b/Carbonite/Carbonite.toc
index 437cc32..e69d17c 100644
--- a/Carbonite/Carbonite.toc
+++ b/Carbonite/Carbonite.toc
@@ -1,4 +1,4 @@
-## Interface: 40400
+## Interface: 40401
 ## Title: Carbonite Maps - Classic @project-version@
 ## Version: @project-version@
 ## Author: No one
diff --git a/Carbonite/NxUI.lua b/Carbonite/NxUI.lua
index 72e2789..80a2c1f 100644
--- a/Carbonite/NxUI.lua
+++ b/Carbonite/NxUI.lua
@@ -24,6 +24,7 @@ local NotInitializedWins = {}
 local L = LibStub("AceLocale-3.0"):GetLocale("Carbonite")
 
 local HideFramesOnEsc = {}
+local GetMouseFoci = GetMouseFoci or GetMouseFocus
 
 function Nx:UIInit()