diff --git a/Carbonite.toc b/Carbonite.toc
index bc0e3b4..e8bc4f6 100644
--- a/Carbonite.toc
+++ b/Carbonite.toc
@@ -1,4 +1,4 @@
-## Interface: 110000, 110002
+## Interface: 110000, 110005
 ## Title: Carbonite Maps @project-version@
 ## Version: @project-version@
 ## Author: No one
@@ -6,6 +6,7 @@
 ## DefaultState: Enabled
 ## LoadOnDemand: 0
 ## SavedVariables: CarbData
+## IconTexture: Interface\AddOns\Carbonite\Gfx\MMBut.tga
 
 ## X-WoWI-ID: 12965
 ## X-Curse-Project-ID: 28460
diff --git a/NxMap.lua b/NxMap.lua
index 55b7430..51ddf08 100644
--- a/NxMap.lua
+++ b/NxMap.lua
@@ -9048,7 +9048,7 @@ function Nx.Map:UpdateInstanceMap()
 			end
 		end
 		
-		if not ((Nx.Map:IsInstanceMap(Nx.Map.RMapId) or Nx.Map:IsBattleGroundMap(Nx.Map.RMapId)) and self.CurOpts.NXInstanceMaps) and not C_Garrison.IsPlayerInGarrison(Enum.GarrisonType.Type_7_0) then		
+		if not ((Nx.Map:IsInstanceMap(Nx.Map.RMapId) or Nx.Map:IsBattleGroundMap(Nx.Map.RMapId)) and self.CurOpts.NXInstanceMaps) and not C_Garrison.IsPlayerInGarrison(Enum.GarrisonType.Type_7_0_Garrison) then		
 			
 			Nx.Map.MouseOver = false
 			Nx.Map:GetMap(1).PlyrFrm:Hide()
@@ -9069,7 +9069,7 @@ function Nx.Map:UpdateInstanceMap()
 				--f.texture:SetColorTexture (1, 0, 0, 0.5)
 			end
 			
-			if C_Garrison.IsPlayerInGarrison(Enum.GarrisonType.Type_6_0) then
+			if C_Garrison.IsPlayerInGarrison(Enum.GarrisonType.Type_6_0_Garrison) then
 			
 				c:SetParent(f)
 				c:SetAllPoints();