diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiXmlLoaderExtensions.cs b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiXmlLoaderExtensions.cs
index 35455467e..5592ab177 100644
--- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiXmlLoaderExtensions.cs
+++ b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiXmlLoaderExtensions.cs
@@ -84,11 +84,15 @@ public static void Load (this JavaPackage package, XmlReader reader, bool isRefe
 		static readonly string [] expected_type_attributes = new String [] {
 			"abstract",
 			"deprecated",
+			"enclosing-method-jni-type",
+			"enclosing-method-name",
+			"enclosing-method-signature",
 			"final",
+			"jni-signature",
 			"name",
+			"source-file-name",
 			"static",
 			"visibility",
-			"jni-signature",
 		};
 
 		internal static void LoadTypeAttributes (this JavaType type, XmlReader reader, params string [] otherAllowedAttributes)
diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/XmlUtil.cs b/src/Xamarin.Android.Tools.ApiXmlAdjuster/XmlUtil.cs
index 388425a94..7a5f1dff7 100644
--- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/XmlUtil.cs
+++ b/src/Xamarin.Android.Tools.ApiXmlAdjuster/XmlUtil.cs
@@ -24,7 +24,7 @@ public static Exception UnexpectedAttribute (XmlReader reader, string elementNam
 		{
 			if (reader.NodeType != XmlNodeType.Attribute)
 				throw new ArgumentException (string.Format ("Internal error: XmlReader should be positioned on attribute, but it is on {0}", reader.NodeType));
-			return new Exception (string.Format ("{0}: Element '{1}' has an unexpected attribute: '{2}'. Expected attributes are: {2}",
+			return new Exception (string.Format ("{0}: Element '{1}' has an unexpected attribute: '{2}'. Expected attributes are: {3}",
 				GetLocation (reader), elementName, reader.LocalName, string.Join (", ", expected)));
 		}