diff --git a/lib/rules.xml b/lib/rules.xml
index e162b65..e4891fe 100644
--- a/lib/rules.xml
+++ b/lib/rules.xml
@@ -50,7 +50,7 @@
 			| ReviewMisleadingFieldNamesRule | VariableNamesShouldNotMatchFieldNamesRule" 
 			from="Gendarme.Rules.Maintainability.dll"/>
 		<rules include="*" from="Gendarme.Rules.Globalization.dll"/>
-		<rules include="*" from="Gendarme.Rules.Xamarin.dll"/>
+		<!-- rules include="*" from="Gendarme.Rules.Xamarin.dll" -->
 		<!-- no rule from Gendarme.Rules.Gendarme is included in this set -->
 		<!-- no rule from Gendarme.Rules.Interoperability.Com is included in this set -->
 		<!-- no rule from Gendarme.Rules.NUnit is included in this set -->
diff --git a/src/Gendarme.Rules.Xamarin.csproj b/src/Gendarme.Rules.Xamarin.csproj
index 426bc95..bf4f969 100644
--- a/src/Gendarme.Rules.Xamarin.csproj
+++ b/src/Gendarme.Rules.Xamarin.csproj
@@ -20,7 +20,8 @@
     <ConsolePause>false</ConsolePause>
     <CustomCommands>
       <CustomCommands>
-        <Command type="Custom" name="Run Gendarme" command="${SolutionDir}/../bin/gendarme.exe --set xamarin /Users/zgramana/Xamarin/Tests/Components/NetworkComms.Net-2.3.0/lib/ios/NetworkCommsDotNetCore.dll" workingdir="${SolutionDir}/../bin/" />
+        <Command type="Execute" command="${SolutionDir}/../bin/gendarme.exe --set component-store --severity critical /Users/zgramana/Xamarin/Tests/Components/examples/lib/ios/Target.1.dll" workingdir="${SolutionDir}/../bin" />
+        <Command type="Clean" />
       </CustomCommands>
     </CustomCommands>
   </PropertyGroup>
@@ -32,8 +33,9 @@
     <ConsolePause>false</ConsolePause>
     <CustomCommands>
       <CustomCommands>
-        <Command type="Build" command="cp lib/* ${TargetDir}" workingdir="${SolutionDir}/../" externalConsole="True" />
+        <Command type="AfterBuild" command="cp lib/* ${TargetDir}" workingdir="${SolutionDir}/../" externalConsole="True" />
         <Command type="AfterClean" command="ls lib &gt; temp; cd bin; cat ../temp | xargs -o rm -f ; cd ..; rm temp" workingdir="${SolutionDir}/../" externalConsole="True" />
+        <Command type="Execute" command="${SolutionDir}/../bin/gendarme.exe --set component-store --severity critical --confidence high /Users/zgramana/Xamarin/Tests/Components/examples/lib/ios/Target.1.dll" workingdir="${SolutionDir}/../bin" />
       </CustomCommands>
     </CustomCommands>
   </PropertyGroup>
diff --git a/src/TargetsPrereleaseXamarinIOS.cs b/src/TargetsPrereleaseXamarinIOS.cs
index 122bbaa..c478f1d 100644
--- a/src/TargetsPrereleaseXamarinIOS.cs
+++ b/src/TargetsPrereleaseXamarinIOS.cs
@@ -17,7 +17,7 @@ namespace Gendarme.Rules.Xamarin
 		public RuleResult CheckAssembly (AssemblyDefinition assembly)
 		{
 			// Short circuit for non-Xamarin targets (e.g. winrt, wp8).
-			if (!TargetsPrereleaseXamarinIOS.TargetsXamarinPlatforms (assembly))
+			if (!TargetsPrereleaseXamarinIOS.TargetsXamarin (assembly))
 				return RuleResult.DoesNotApply;
 
 			// Look for the TargetPlatform attribute, which indicates
@@ -55,13 +55,20 @@ namespace Gendarme.Rules.Xamarin
 		static bool CheckForMT2002 (AssemblyDefinition assembly)
 		{
 			var result = false;
+
 			// We need to see if this module's member references table
 			// has an entry to a method that we know was not implemented
 			// in Stable, but was implemented in Beta or Alpha.
 			var refs = assembly.MainModule.GetMemberReferences ();
+			var types = assembly.MainModule.GetTypeReferences ();
 
-			var badRef = refs.SingleOrDefault (m => m.FullName == "System.Boolean System.Type::op_Equality(System.Type,System.Type)");
-			if (badRef != null)
+			if (refs.Any (m => m.FullName == "System.Boolean System.Type::op_Equality(System.Type,System.Type)"))
+				result = true;
+
+			// In .NET 4.5, System.Runtime.CompilerServices.ExtensionAttribute was moved to mscorelib.
+			// In previous versions, it lived in System.core.
+			else if (types.Any (t => t.FullName == "System.Runtime.CompilerServices.ExtensionAttribute" 
+			                      && t.Scope.Name == "mscorlib"))
 				result = true;
 
 			return result;
@@ -72,9 +79,9 @@ namespace Gendarme.Rules.Xamarin
 		/// </summary>
 		/// <returns><c>true</c>, if xamarin platforms was targetsed, <c>false</c> otherwise.</returns>
 		/// <param name="assembly">Assembly.</param>
-		static bool TargetsXamarinPlatforms (AssemblyDefinition assembly)
+		static bool TargetsXamarin (AssemblyDefinition assembly)
 		{
-			return assembly.MainModule.AssemblyReferences.Any (aref => aref.PublicKeyToken.Equals (XamarinRuntimeAssemblyToken));
+			return assembly.MainModule.AssemblyReferences.Any (aref =>  aref.PublicKeyToken.SequenceEqual (XamarinRuntimeAssemblyToken));
 		}
 	}
 }
\ No newline at end of file