diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs
index ebccbfd94..a99542417 100644
--- a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs
+++ b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs
@@ -130,7 +130,7 @@ void AddNestedTypes (TypeDefinition type)
 				}
 			}
 
-			foreach (MethodDefinition imethod in type.Interfaces.Cast<TypeReference> ()
+			foreach (MethodDefinition imethod in type.Interfaces.Select (ifaceInfo => ifaceInfo.InterfaceType)
 					.Select (r => {
 						var d = r.Resolve ();
 						if (d == null)
@@ -141,7 +141,7 @@ void AddNestedTypes (TypeDefinition type)
 						return d;
 					})
 					.Where (d => GetRegisterAttributes (d).Any ())
-					.SelectMany (d => d.Methods.Cast<MethodDefinition>())) {
+					.SelectMany (d => d.Methods)) {
 				AddMethod (imethod, imethod);
 			}
 
@@ -538,7 +538,7 @@ void GenerateHeader (TextWriter sw)
 			sw.WriteLine ("\textends " + extendsType);
 			sw.WriteLine ("\timplements");
 			sw.Write ("\t\tmono.android.IGCUserPeer");
-			IEnumerable<TypeDefinition> ifaces = type.Interfaces.Cast<TypeReference>()
+			IEnumerable<TypeDefinition> ifaces = type.Interfaces.Select (ifaceInfo => ifaceInfo.InterfaceType)
 				.Select (r => r.Resolve ())
 				.Where (d => GetRegisterAttributes (d).Any ());
 			if (ifaces.Any ()) {
diff --git a/src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JniType.cs b/src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JniType.cs
index c4b9b6706..7469a59ff 100644
--- a/src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JniType.cs
+++ b/src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JniType.cs
@@ -612,14 +612,14 @@ internal static bool IsNonStaticInnerClass (TypeDefinition type)
 				return false;
 
 			return GetBaseConstructors (type)
-				.Any (ctor => ctor.Parameters.Cast<ParameterDefinition> ().Any (p => p.Name == "__self"));
+				.Any (ctor => ctor.Parameters.Any (p => p.Name == "__self"));
 		}
 
 		static IEnumerable<MethodDefinition> GetBaseConstructors (TypeDefinition type)
 		{
 			var baseType = type.GetBaseTypes ().FirstOrDefault (t => t.GetCustomAttributes (typeof (RegisterAttribute)).Any ());
 			if (baseType != null)
-				return baseType.Methods.Where (m => m.IsConstructor && !m.IsStatic).Cast<MethodDefinition> ();
+				return baseType.Methods.Where (m => m.IsConstructor && !m.IsStatic);
 			return Enumerable.Empty<MethodDefinition> ();
 		}
 #endif  // HAVE_CECIL