diff --git a/Include/auROXTL/AU_MACROS.hpp b/Include/auROXTL/AU_MACROS.hpp
index 179719d..2b20149 100644
--- a/Include/auROXTL/AU_MACROS.hpp
+++ b/Include/auROXTL/AU_MACROS.hpp
@@ -24,7 +24,7 @@
 #endif
 
 #if !defined(AU_WEAK_FROM_THIS)
-    #define AU_WEAK_FROM_THIS        (AuWPtr<AuRemovePointer_t<decltype(this)>>(AuStaticPointerCast<AuRemovePointer_t<decltype(this)>>(this->SharedFromThis())))
+    #define AU_WEAK_FROM_THIS        (AuWPtr<AuRemovePointer_t<decltype(this)>>(AU_SHARED_FROM_THIS))
 #endif
 
 #define AU_BRACKET_SCOPE(...)    __VA_ARGS__
@@ -262,6 +262,11 @@ struct AuStringOwnedException : AuStringException
     #define AuWeakFromThis() AU_SHARED_FROM_THIS
 #endif
 
+#if !defined(AuSharedPointerFromThis)
+    #define AuSharedPointerFromThis(pPtr) (AuSPtr<AuRemoveReference_t<decltype(*pPtr)>>(AuSharedFromThis(), pPtr)) 
+#endif
+
+
 #define AU_EMIT_FIRST_COMMA_FIRST(n)n
 #define AU_EMIT_FIRST_COMMA_OTHERS(n),n