diff --git a/Source/Engine/Debug/Exceptions/ArgumentException.h b/Source/Engine/Debug/Exceptions/ArgumentException.h
index 32142f60e..e3f4a1df4 100644
--- a/Source/Engine/Debug/Exceptions/ArgumentException.h
+++ b/Source/Engine/Debug/Exceptions/ArgumentException.h
@@ -24,7 +24,7 @@ namespace Log
         /// <summary>
         /// Creates default exception with additional data
         /// </summary>
-        /// <param name="message">Additional information that help describe error</param>
+        /// <param name="additionalInfo">Additional information that help describe error</param>
         ArgumentException(const String& additionalInfo)
             : Exception(TEXT("One or more of provided arguments are not valid."), additionalInfo)
         {
@@ -33,7 +33,8 @@ namespace Log
         /// <summary>
         /// Creates default exception with additional data
         /// </summary>
-        /// <param name="message">Additional information that help describe error</param>
+        /// <param name="argumentName">Argument name</param>
+        /// <param name="additionalInfo">Additional information that help describe error</param>
         ArgumentException(const String& argumentName, const String& additionalInfo)
             : Exception(String::Format(TEXT("Provided argument {0} is not valid."), argumentName), additionalInfo)
         {
diff --git a/Source/Engine/Debug/Exceptions/ArgumentNullException.h b/Source/Engine/Debug/Exceptions/ArgumentNullException.h
index ef0ea95d5..dc2d9ea0f 100644
--- a/Source/Engine/Debug/Exceptions/ArgumentNullException.h
+++ b/Source/Engine/Debug/Exceptions/ArgumentNullException.h
@@ -24,7 +24,7 @@ namespace Log
         /// <summary>
         /// Creates default exception with additional data
         /// </summary>
-        /// <param name="message">Additional information that help describe error</param>
+        /// <param name="additionalInfo">Additional information that help describe error</param>
         ArgumentNullException(const String& additionalInfo)
             : Exception(TEXT("One or more of provided arguments is null"), additionalInfo)
         {
@@ -33,7 +33,8 @@ namespace Log
         /// <summary>
         /// Creates default exception with additional data
         /// </summary>
-        /// <param name="message">Additional information that help describe error</param>
+        /// <param name="argumentName">Argument name</param>
+        /// <param name="additionalInfo">Additional information that help describe error</param>
         ArgumentNullException(const String& argumentName, const String& additionalInfo)
             : Exception(String::Format(TEXT("Provided argument {0} is null."), argumentName), additionalInfo)
         {
diff --git a/Source/Engine/Debug/Exceptions/ArgumentOutOfRangeException.h b/Source/Engine/Debug/Exceptions/ArgumentOutOfRangeException.h
index 011b64bbb..f75576062 100644
--- a/Source/Engine/Debug/Exceptions/ArgumentOutOfRangeException.h
+++ b/Source/Engine/Debug/Exceptions/ArgumentOutOfRangeException.h
@@ -24,7 +24,7 @@ namespace Log
         /// <summary>
         /// Creates default exception with additional data
         /// </summary>
-        /// <param name="message">Additional information that help describe error</param>
+        /// <param name="additionalInfo">Additional information that help describe error</param>
         ArgumentOutOfRangeException(const String& additionalInfo)
             : Exception(TEXT("One or more of provided arguments has index out of range"), additionalInfo)
         {
@@ -33,7 +33,8 @@ namespace Log
         /// <summary>
         /// Creates default exception with additional data
         /// </summary>
-        /// <param name="message">Additional information that help describe error</param>
+        /// <param name="argumentName">Argument name</param>
+        /// <param name="additionalInfo">Additional information that help describe error</param>
         ArgumentOutOfRangeException(const String& argumentName, const String& additionalInfo)
             : Exception(String::Format(TEXT("Provided argument {0} is out of range."), argumentName), additionalInfo)
         {
diff --git a/Source/Engine/Debug/Exceptions/CLRInnerException.h b/Source/Engine/Debug/Exceptions/CLRInnerException.h
index a46f289f0..8a7c5e09e 100644
--- a/Source/Engine/Debug/Exceptions/CLRInnerException.h
+++ b/Source/Engine/Debug/Exceptions/CLRInnerException.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include "Engine/Debug/Exception.h"
+#include "Engine/Scripting/Types.h"
 
 namespace Log
 {
@@ -28,8 +29,8 @@ namespace Log
         CLRInnerException(const String& additionalInfo)
             : Exception(String::Format(TEXT("Current {0} CLR method has thrown an inner exception"),
 #if USE_MONO
-        TEXT("Mono")
-#elif USE_CORECLR
+            TEXT("Mono")
+#elif USE_NETCORE
             TEXT(".NET Core")
 #else
             TEXT("Unknown engine")
diff --git a/Source/Engine/Debug/Exceptions/DivideByZeroException.h b/Source/Engine/Debug/Exceptions/DivideByZeroException.h
index 3d319df19..cda5a637f 100644
--- a/Source/Engine/Debug/Exceptions/DivideByZeroException.h
+++ b/Source/Engine/Debug/Exceptions/DivideByZeroException.h
@@ -24,7 +24,7 @@ namespace Log
         /// <summary>
         /// Creates default exception with additional data
         /// </summary>
-        /// <param name="message">Additional information that help describe error</param>
+        /// <param name="additionalInfo">Additional information that help describe error</param>
         DivideByZeroException(const String& additionalInfo)
             : Exception(TEXT("Tried to divide value by zero"), additionalInfo)
         {
diff --git a/Source/Engine/Debug/Exceptions/FileNotFoundException.h b/Source/Engine/Debug/Exceptions/FileNotFoundException.h
index bcb9463d5..09e0cc3fb 100644
--- a/Source/Engine/Debug/Exceptions/FileNotFoundException.h
+++ b/Source/Engine/Debug/Exceptions/FileNotFoundException.h
@@ -24,7 +24,7 @@ namespace Log
         /// <summary>
         /// Creates default exception with additional data
         /// </summary>
-        /// <param name="message">Additional information that help describe error</param>
+        /// <param name="additionalInfo">Additional information that help describe error</param>
         FileNotFoundException(const String& additionalInfo)
             : Exception(TEXT("File not found"), additionalInfo)
         {
diff --git a/Source/Engine/Debug/Exceptions/IOException.h b/Source/Engine/Debug/Exceptions/IOException.h
index f130c7e18..b0fadec6f 100644
--- a/Source/Engine/Debug/Exceptions/IOException.h
+++ b/Source/Engine/Debug/Exceptions/IOException.h
@@ -24,7 +24,7 @@ namespace Log
         /// <summary>
         /// Creates default exception with additional data
         /// </summary>
-        /// <param name="message">Additional information that help describe error</param>
+        /// <param name="additionalInfo">Additional information that help describe error</param>
         IOException(const String& additionalInfo)
             : Exception(TEXT("I/O error occurred."), additionalInfo)
         {
diff --git a/Source/Engine/Debug/Exceptions/IndexOutOfRangeException.h b/Source/Engine/Debug/Exceptions/IndexOutOfRangeException.h
index 23511d5ce..445b8df59 100644
--- a/Source/Engine/Debug/Exceptions/IndexOutOfRangeException.h
+++ b/Source/Engine/Debug/Exceptions/IndexOutOfRangeException.h
@@ -24,7 +24,7 @@ namespace Log
         /// <summary>
         /// Creates default exception with additional data
         /// </summary>
-        /// <param name="message">Additional information that help describe error</param>
+        /// <param name="additionalInfo">Additional information that help describe error</param>
         IndexOutOfRangeException(const String& additionalInfo)
             : Exception(TEXT("Index is out of range for items in array"), additionalInfo)
         {
diff --git a/Source/Engine/Debug/Exceptions/InvalidOperationException.h b/Source/Engine/Debug/Exceptions/InvalidOperationException.h
index 3194741b1..63299ff82 100644
--- a/Source/Engine/Debug/Exceptions/InvalidOperationException.h
+++ b/Source/Engine/Debug/Exceptions/InvalidOperationException.h
@@ -24,7 +24,7 @@ namespace Log
         /// <summary>
         /// Creates default exception with additional data
         /// </summary>
-        /// <param name="message">Additional information that help describe error</param>
+        /// <param name="additionalInfo">Additional information that help describe error</param>
         InvalidOperationException(const String& additionalInfo)
             : Exception(TEXT("Current object didn't exists or its state was invalid."), additionalInfo)
         {
diff --git a/Source/Engine/Debug/Exceptions/NotImplementedException.h b/Source/Engine/Debug/Exceptions/NotImplementedException.h
index 49e330a73..118b57187 100644
--- a/Source/Engine/Debug/Exceptions/NotImplementedException.h
+++ b/Source/Engine/Debug/Exceptions/NotImplementedException.h
@@ -24,7 +24,7 @@ namespace Log
         /// <summary>
         /// Creates default exception with additional data
         /// </summary>
-        /// <param name="message">Additional information that help describe error</param>
+        /// <param name="additionalInfo">Additional information that help describe error</param>
         NotImplementedException(const String& additionalInfo)
             : Exception(TEXT("Current method or operation is not implemented."), additionalInfo)
         {
diff --git a/Source/Engine/Debug/Exceptions/NotSupportedException.h b/Source/Engine/Debug/Exceptions/NotSupportedException.h
index 44f692480..c4ecbaa40 100644
--- a/Source/Engine/Debug/Exceptions/NotSupportedException.h
+++ b/Source/Engine/Debug/Exceptions/NotSupportedException.h
@@ -24,7 +24,7 @@ namespace Log
         /// <summary>
         /// Creates default exception with additional data
         /// </summary>
-        /// <param name="message">Additional information that help describe error</param>
+        /// <param name="additionalInfo">Additional information that help describe error</param>
         NotSupportedException(const String& additionalInfo)
             : Exception(TEXT("Current method or operation is not supported in current context"), additionalInfo)
         {
diff --git a/Source/Engine/Debug/Exceptions/OverflowException.h b/Source/Engine/Debug/Exceptions/OverflowException.h
index d484d109e..3b158cae3 100644
--- a/Source/Engine/Debug/Exceptions/OverflowException.h
+++ b/Source/Engine/Debug/Exceptions/OverflowException.h
@@ -24,7 +24,7 @@ namespace Log
         /// <summary>
         /// Creates default exception with additional data
         /// </summary>
-        /// <param name="message">Additional information that help describe error</param>
+        /// <param name="additionalInfo">Additional information that help describe error</param>
         OverflowException(const String& additionalInfo)
             : Exception(TEXT("Arithmetic, casting, or conversion operation results in an overflow."), additionalInfo)
         {
diff --git a/Source/Engine/Debug/Exceptions/PathTooLongException.h b/Source/Engine/Debug/Exceptions/PathTooLongException.h
index cc350986c..76d270a62 100644
--- a/Source/Engine/Debug/Exceptions/PathTooLongException.h
+++ b/Source/Engine/Debug/Exceptions/PathTooLongException.h
@@ -24,7 +24,7 @@ namespace Log
         /// <summary>
         /// Creates default exception with additional data
         /// </summary>
-        /// <param name="message">Additional information that help describe error</param>
+        /// <param name="additionalInfo">Additional information that help describe error</param>
         PathTooLongException(const String& additionalInfo)
             : Exception(TEXT("Path too long."), additionalInfo)
         {
diff --git a/Source/Engine/Debug/Exceptions/PlatformNotSupportedException.h b/Source/Engine/Debug/Exceptions/PlatformNotSupportedException.h
index 46559080b..ad84233e1 100644
--- a/Source/Engine/Debug/Exceptions/PlatformNotSupportedException.h
+++ b/Source/Engine/Debug/Exceptions/PlatformNotSupportedException.h
@@ -24,7 +24,7 @@ namespace Log
         /// <summary>
         /// Creates default exception with additional data
         /// </summary>
-        /// <param name="message">Additional information that help describe error</param>
+        /// <param name="additionalInfo">Additional information that help describe error</param>
         PlatformNotSupportedException(const String& additionalInfo)
             : Exception(TEXT("Method or operation in not supported on current platform."), additionalInfo)
         {
diff --git a/Source/Engine/Debug/Exceptions/TimeoutException.h b/Source/Engine/Debug/Exceptions/TimeoutException.h
index 9220e50cf..67c1c64a3 100644
--- a/Source/Engine/Debug/Exceptions/TimeoutException.h
+++ b/Source/Engine/Debug/Exceptions/TimeoutException.h
@@ -24,7 +24,7 @@ namespace Log
         /// <summary>
         /// Creates default exception with additional data
         /// </summary>
-        /// <param name="message">Additional information that help describe error</param>
+        /// <param name="additionalInfo">Additional information that help describe error</param>
         TimeoutException(const String& additionalInfo)
             : Exception(TEXT("Current operation has timed out."), additionalInfo)
         {