diff --git a/ElunaTemplate.cpp b/ElunaTemplate.cpp
index 7d831ceb32..73a9953344 100644
--- a/ElunaTemplate.cpp
+++ b/ElunaTemplate.cpp
@@ -57,20 +57,20 @@ template<> inline int ElunaTemplate<unsigned long long>::Mod(lua_State* L) { ret
 template<> inline int ElunaTemplate<unsigned long long>::Equal(lua_State* L) { return PerformBinaryOp<unsigned long long>(L, std::equal_to<unsigned long long>()); }
 template<> inline int ElunaTemplate<unsigned long long>::Less(lua_State* L) { return PerformBinaryOp<unsigned long long>(L, std::less<unsigned long long>()); }
 template<> inline int ElunaTemplate<unsigned long long>::LessOrEqual(lua_State* L) { return PerformBinaryOp<unsigned long long>(L, std::less_equal<unsigned long long>()); }
-template<> inline int ElunaTemplate<unsigned long long>::ToString(lua_State* L) { return ToStringHelper<unsigned long long>(L); }
-template<> inline int ElunaTemplate<unsigned long long>::Pow(lua_State* L) { return PowHelper<unsigned long long>(L); }
+template<> inline int ElunaTemplate<unsigned long long>::ToString(lua_State* L) { return ToStringHelper(L); }
+template<> inline int ElunaTemplate<unsigned long long>::Pow(lua_State* L) { return PowHelper(L); }
 
-template<> inline int ElunaTemplate<long long>::Add(lua_State* L) { return PerformBinaryOp<long long>(L, std::plus<long long>()); }
-template<> inline int ElunaTemplate<long long>::Subtract(lua_State* L) { return PerformBinaryOp<long long>(L, std::minus<long long>()); }
-template<> inline int ElunaTemplate<long long>::Multiply(lua_State* L) { return PerformBinaryOp<long long>(L, std::multiplies<long long>()); }
-template<> inline int ElunaTemplate<long long>::Divide(lua_State* L) { return PerformBinaryOp<long long>(L, std::divides<long long>()); }
-template<> inline int ElunaTemplate<long long>::Mod(lua_State* L) { return PerformBinaryOp<long long>(L, std::modulus<long long>()); }
-template<> inline int ElunaTemplate<long long>::UnaryMinus(lua_State* L) { return PerformUnaryOp<long long>(L, std::negate<long long>()); }
-template<> inline int ElunaTemplate<long long>::Equal(lua_State* L) { return PerformBinaryOp<long long>(L, std::equal_to<long long>()); }
-template<> inline int ElunaTemplate<long long>::Less(lua_State* L) { return PerformBinaryOp<long long>(L, std::less<long long>()); }
-template<> inline int ElunaTemplate<long long>::LessOrEqual(lua_State* L) { return PerformBinaryOp<long long>(L, std::less_equal<long long>()); }
-template<> inline int ElunaTemplate<long long>::ToString(lua_State* L) { return ToStringHelper<long long>(L); }
-template<> inline int ElunaTemplate<long long>::Pow(lua_State* L) { return PowHelper<long long>(L); }
+template<> inline int ElunaTemplate<long long>::Add(lua_State* L) { return PerformBinaryOp<unsigned long long>(L, std::plus<long long>()); }
+template<> inline int ElunaTemplate<long long>::Subtract(lua_State* L) { return PerformBinaryOp<unsigned long long>(L, std::minus<long long>()); }
+template<> inline int ElunaTemplate<long long>::Multiply(lua_State* L) { return PerformBinaryOp<unsigned long long>(L, std::multiplies<long long>()); }
+template<> inline int ElunaTemplate<long long>::Divide(lua_State* L) { return PerformBinaryOp<unsigned long long>(L, std::divides<long long>()); }
+template<> inline int ElunaTemplate<long long>::Mod(lua_State* L) { return PerformBinaryOp<unsigned long long>(L, std::modulus<long long>()); }
+template<> inline int ElunaTemplate<long long>::UnaryMinus(lua_State* L) { return PerformUnaryOp<unsigned long long>(L, std::negate<long long>()); }
+template<> inline int ElunaTemplate<long long>::Equal(lua_State* L) { return PerformBinaryOp<unsigned long long>(L, std::equal_to<long long>()); }
+template<> inline int ElunaTemplate<long long>::Less(lua_State* L) { return PerformBinaryOp<unsigned long long>(L, std::less<long long>()); }
+template<> inline int ElunaTemplate<long long>::LessOrEqual(lua_State* L) { return PerformBinaryOp<unsigned long long>(L, std::less_equal<long long>()); }
+template<> inline int ElunaTemplate<long long>::ToString(lua_State* L) { return ToStringHelper(L); }
+template<> inline int ElunaTemplate<long long>::Pow(lua_State* L) { return PowHelper(L); }
 
 template<> inline int ElunaTemplate<ObjectGuid>::Equal(lua_State* L) { Eluna* E = Eluna::GetEluna(L); E->Push(E->CHECKVAL<ObjectGuid>(1) == E->CHECKVAL<ObjectGuid>(2)); return 1; }
 template<> inline int ElunaTemplate<ObjectGuid>::ToString(lua_State* L)
diff --git a/ElunaTemplate.h b/ElunaTemplate.h
index 63ff4f91c3..16572f5d28 100644
--- a/ElunaTemplate.h
+++ b/ElunaTemplate.h
@@ -474,8 +474,8 @@ class ElunaTemplate
         return 1;
     }
 
-    template <typename T>
-    static int PerformBinaryOp(lua_State* L, std::function<T(T, T)> binaryOp)
+    template<typename F>
+    static int PerformBinaryOp(lua_State* L, std::function<F(F, F)> binaryOp)
     {
         Eluna* E = Eluna::GetEluna(L);
 
@@ -485,17 +485,16 @@ class ElunaTemplate
         return 1;
     }
 
-    template <typename T>
-    static int PerformUnaryOp(lua_State* L, std::function<T(T)> unaryOp)
+    template<typename F>
+    static int PerformUnaryOp(lua_State* L, std::function<F(F)> unaryOp)
     {
         Eluna* E = Eluna::GetEluna(L);
 
-        T val1 = E->CHECKVAL<T>(1);
-        E->Push(unaryOp(val1));
+        T val = E->CHECKVAL<T>(1);
+        E->Push(unaryOp(val));
         return 1;
     }
 
-    template <typename T>
     static int ToStringHelper(lua_State* L)
     {
         Eluna* E = Eluna::GetEluna(L);
@@ -507,7 +506,6 @@ class ElunaTemplate
         return 1;
     }
 
-    template <typename T>
     static int PowHelper(lua_State* L)
     {
         Eluna* E = Eluna::GetEluna(L);