diff --git a/Unity/Assets/NativeScript/Editor/GenerateBindings.cs b/Unity/Assets/NativeScript/Editor/GenerateBindings.cs
index 29fe4c7..be815bc 100644
--- a/Unity/Assets/NativeScript/Editor/GenerateBindings.cs
+++ b/Unity/Assets/NativeScript/Editor/GenerateBindings.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
@@ -3427,7 +3427,15 @@ static void AppendEventAddRemoveMethod(
 				builders.CsharpFunctions);
 			builders.CsharpFunctions.Append('.');
 			builders.CsharpFunctions.Append(eventName);
-			builders.CsharpFunctions.Append(" += del;");
+			// TODO: More safely differenciate between add/removing event delegates
+			if (funcName.Contains("RemoveEvent"))
+			{
+				builders.CsharpFunctions.Append(" -= del;");
+			}
+			else
+			{
+				builders.CsharpFunctions.Append(" += del;");
+			}
 			AppendCsharpFunctionEnd(
 				typeof(void),
 				null,
@@ -4155,7 +4163,8 @@ static void AppendMethod(
 				AppendCppMethodDeclaration(
 					cppMethodName,
 					enclosingTypeIsStatic,
-					false,
+					// Mark as virtual if method/class is not static or generic
+					cppMethodIsStatic || enclosingTypeIsStatic || methodTypeParams != null? false : true,
 					cppMethodIsStatic,
 					cppReturnType,
 					methodTypeParams,
@@ -10573,18 +10582,21 @@ StringBuilder output
 			for (int i = 0; i < parameters.Length; ++i)
 			{
 				ParameterInfo param = parameters[i];
-				if (param.Kind == TypeKind.FullStruct)
-				{
-					AppendCsharpTypeFullName(
-						param.ParameterType,
-						output);
-					output.Append(" param");
-					output.Append(i);
-				}
-				else
+				switch (param.Kind)
 				{
-					output.Append("int param");
-					output.Append(i);
+					case TypeKind.FullStruct:
+					case TypeKind.Primitive:
+					case TypeKind.Enum:
+						AppendCsharpTypeFullName(
+							param.ParameterType,
+							output);
+						output.Append(" param");
+						output.Append(i);
+						break;
+					default:
+						output.Append("int param");
+						output.Append(i);
+						break;
 				}
 				if (i != parameters.Length-1)
 				{
@@ -13639,4 +13651,4 @@ static string InjectIntoString(
 			}
 		}
 	}
-}
\ No newline at end of file
+}