diff --git a/WeakAuras/Init.lua b/WeakAuras/Init.lua
index b836416..8b1a1dd 100644
--- a/WeakAuras/Init.lua
+++ b/WeakAuras/Init.lua
@@ -33,7 +33,7 @@ WeakAuras.versionMismatchPrint = function()
 end
 
 if versionString ~= versionStringFromToc and versionStringFromToc ~= "Dev" then
-  C_Timer:After(1, WeakAuras.versionMismatchPrint)
+  C_Timer.After(1, WeakAuras.versionMismatchPrint)
 end
 
 WeakAuras.PowerAurasPath = "Interface\\Addons\\WeakAuras\\PowerAurasMedia\\Auras\\"
diff --git a/WeakAuras/Libs/LibGetFrame-1.0/LibGetFrame-1.0.lua b/WeakAuras/Libs/LibGetFrame-1.0/LibGetFrame-1.0.lua
index 8f564ef..3ef992e 100644
--- a/WeakAuras/Libs/LibGetFrame-1.0/LibGetFrame-1.0.lua
+++ b/WeakAuras/Libs/LibGetFrame-1.0/LibGetFrame-1.0.lua
@@ -97,7 +97,7 @@ local function ScanForUnitFrames(noDelay)
         callbacks:Fire("GETFRAME_REFRESH")
     elseif not wait then
         wait = true
-        C_Timer:After(1, function()
+        C_Timer.After(1, function()
             wipe(GetFramesCache)
             ScanFrames(0, UIParent)
             wait = false
diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
index 530ba3a..d29ff56 100644
--- a/WeakAuras/WeakAuras.lua
+++ b/WeakAuras/WeakAuras.lua
@@ -2116,7 +2116,7 @@ function WeakAuras.RegisterLoadEvents()
   end);
 
 --[[
-  C_Timer:NewTicker(0.5, function()
+  C_Timer.NewTicker(0.5, function()
     WeakAuras.StartProfileSystem("load");
     local zoneId = C_Map.GetBestMapForUnit("player");
     if loadFrame.zoneId ~= zoneId then
diff --git a/WeakAuras/compat.lua b/WeakAuras/compat.lua
index 57ed0c7..197a145 100644
--- a/WeakAuras/compat.lua
+++ b/WeakAuras/compat.lua
@@ -1,5 +1,6 @@
 local ipairs = ipairs
 local pairs = pairs
+local select = select
 local ceil, floor = math.ceil, math.floor
 
 local GetInstanceInfo = GetInstanceInfo
@@ -14,7 +15,7 @@ function tInvert(tbl)
 	return inverted;
 end
 
-function Mixin(object, ...)
+local function Mixin(object, ...)
 	for i = 1, select("#", ...) do
 		local mixin = select(i, ...);
 		for k, v in pairs(mixin) do
@@ -236,15 +237,15 @@ if not C_Timer or C_Timer._version ~= 2 then
 		return ticker
 	end
 
-	function C_Timer:After(duration, callback)
+	function C_Timer.After(duration, callback)
 		return CreateTicker(duration, callback, 1)
 	end
 
-	function C_Timer:NewTimer(duration, callback)
+	function C_Timer.NewTimer(duration, callback)
 		return CreateTicker(duration, callback, 1)
 	end
 
-	function C_Timer:NewTicker(duration, callback, iterations)
+	function C_Timer.NewTicker(duration, callback, iterations)
 		return CreateTicker(duration, callback, iterations)
 	end
 
diff --git a/WeakAurasOptions/WeakAurasOptions.lua b/WeakAurasOptions/WeakAurasOptions.lua
index 4b2e61f..4fc8e56 100644
--- a/WeakAurasOptions/WeakAurasOptions.lua
+++ b/WeakAurasOptions/WeakAurasOptions.lua
@@ -2785,7 +2785,7 @@ end
 -- Thus Reload the options after a very small delay.
 function WeakAuras.ScheduleReloadOptions(data)
   if (type(data.id) ~= "table") then
-    C_Timer:After(0.1, function()
+    C_Timer.After(0.1, function()
       WeakAuras.ReloadOptions(data.id)
     end );
   end