diff --git a/tools/generator/GenBaseSupport.cs b/tools/generator/GenBaseSupport.cs
index ca57958a1..ed91ebc12 100644
--- a/tools/generator/GenBaseSupport.cs
+++ b/tools/generator/GenBaseSupport.cs
@@ -148,7 +148,7 @@ public override GenericParameterDefinitionList TypeParameters {
 		}
 
 		public override string Visibility {
-			get { return t.IsPublic ? "public" : "protected internal"; }
+			get { return t.IsPublic || t.IsNestedPublic ? "public" : "protected internal"; }
 		}
 	}
 #endif
diff --git a/tools/generator/JavaApiDllLoaderExtensions.cs b/tools/generator/JavaApiDllLoaderExtensions.cs
index 9d64d1e04..683ebece5 100644
--- a/tools/generator/JavaApiDllLoaderExtensions.cs
+++ b/tools/generator/JavaApiDllLoaderExtensions.cs
@@ -1,5 +1,6 @@
 #if GENERATOR
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using MonoDroid.Generation;
 
@@ -7,7 +8,7 @@ namespace Xamarin.Android.Tools.ApiXmlAdjuster
 {
 	public static class JavaApiDllLoaderExtensions
 	{
-		public static void LoadReferences (this JavaApi api, GenBase [] gens)
+		public static void LoadReferences (this JavaApi api, IEnumerable<GenBase> gens)
 		{
 			JavaPackage pkg = null;
 			foreach (var gen in gens.Where (_ => _.IsAcw)) {
@@ -27,6 +28,7 @@ public static void LoadReferences (this JavaApi api, GenBase [] gens)
 				}
 				else
 					throw new InvalidOperationException ();
+				api.LoadReferences (gen.NestedTypes);
 			}
 		}