diff --git a/Include/AuroraInterfaces.hpp b/Include/AuroraInterfaces.hpp
index d15ea9f..c6b912c 100644
--- a/Include/AuroraInterfaces.hpp
+++ b/Include/AuroraInterfaces.hpp
@@ -47,13 +47,13 @@
 
 #define AUI_METHOD_FUNCTIONAL_CTOR_PARAMS_BASE_A(ret, name, params) AUI_METHOD_PROTOTYPE_TO_FUNCTIONAL_CREF(ret, name, params)
 #define AUI_METHOD_FUNCTIONAL_CTOR_PARAMS_BASE_B(ret, name, params) , AUI_METHOD_PROTOTYPE_TO_FUNCTIONAL_CREF(ret, name, params)
-#define AUI_METHOD_FUNCTIONAL_CTOR_PARAMS_REF_A(ret, name, params) AUI_METHOD_PROTOTYPE_TO_FUNCTIONAL_REF(ret, name, params)
-#define AUI_METHOD_FUNCTIONAL_CTOR_PARAMS_REF_B(ret, name, params) , AUI_METHOD_PROTOTYPE_TO_FUNCTIONAL_REF(ret, name, params)
+#define AUI_METHOD_FUNCTIONAL_CTOR_PARAMS_REF_A(ret, name, params)  AUI_METHOD_PROTOTYPE_TO_FUNCTIONAL_REF(ret, name, params)
+#define AUI_METHOD_FUNCTIONAL_CTOR_PARAMS_REF_B(ret, name, params)  , AUI_METHOD_PROTOTYPE_TO_FUNCTIONAL_REF(ret2, name, params)
 
 #define AUI_METHOD_PROTOTYPE_ASSIGN(ret, name, params)                                                                                                      \
     name ## Functional(name ## Functional)
 
-#define AUI_METHOD_FUNCTIONAL_ASSIGN_A(ret, name, params) AUI_METHOD_PROTOTYPE_ASSIGN(ret, name, params)
+#define AUI_METHOD_FUNCTIONAL_ASSIGN_A(ret, name, params) : AUI_METHOD_PROTOTYPE_ASSIGN(ret, name, params)
 #define AUI_METHOD_FUNCTIONAL_ASSIGN_B(ret, name, params) , AUI_METHOD_PROTOTYPE_ASSIGN(ret, name, params)
 
 #define AUI_METHOD_FUNCTIONAL_FWD(ret, name, params)                                                                                                        \
@@ -70,10 +70,10 @@
         AU_FOR_EACH_3(AUI_METHOD_FUNCTIONAL_TYPEDEF, __VA_ARGS__)                                                                                           \
         inline name ## Functional () {}                                                                                                                     \
         inline ~name ## Functional () {}                                                                                                                    \
-        inline name ## Functional (AU_FOR_EACH_FIRST_3(AUI_METHOD_FUNCTIONAL_CTOR_PARAMS_BASE_A, AUI_METHOD_FUNCTIONAL_CTOR_PARAMS_BASE_B, __VA_ARGS__)) :  \
+        inline name ## Functional (AU_FOR_EACH_FIRST_3(AUI_METHOD_FUNCTIONAL_CTOR_PARAMS_BASE_A, AUI_METHOD_FUNCTIONAL_CTOR_PARAMS_BASE_B, __VA_ARGS__))    \
             AU_FOR_EACH_FIRST_3(AUI_METHOD_FUNCTIONAL_ASSIGN_A, AUI_METHOD_FUNCTIONAL_ASSIGN_B, __VA_ARGS__)                                                \
         {}                                                                                                                                                  \
-        inline name ## Functional (AU_FOR_EACH_FIRST_3(AUI_METHOD_FUNCTIONAL_CTOR_PARAMS_REF_A, AUI_METHOD_FUNCTIONAL_CTOR_PARAMS_REF_B, __VA_ARGS__)) :    \
+        inline name ## Functional (AU_FOR_EACH_FIRST_3(AUI_METHOD_FUNCTIONAL_CTOR_PARAMS_REF_A, AUI_METHOD_FUNCTIONAL_CTOR_PARAMS_REF_B, __VA_ARGS__))      \
             AU_FOR_EACH_FIRST_3(AUI_METHOD_FUNCTIONAL_ASSIGN_A, AUI_METHOD_FUNCTIONAL_ASSIGN_B, __VA_ARGS__)                                                \
         {}                                                                                                                                                  \
         AU_FOR_EACH_3(tmpl, __VA_ARGS__)                                                                                                                    \