diff --git a/src/Foundation/Enum.cs b/src/Foundation/Enum.cs
index 52cd5a8e30..b0a7edc328 100644
--- a/src/Foundation/Enum.cs
+++ b/src/Foundation/Enum.cs
@@ -1113,12 +1113,14 @@ namespace XamCore.Foundation  {
 		}
 	}
 
-#if MONOMAC
+	[Mac (10,10,3)]
+	[Watch (4,0)]
+	[TV (11,0)]
+	[iOS (11,0)]
 	[Native]
 	public enum NSProcessInfoThermalState : nint {
 		Nominal, Fair, Serious, Critical
 	}
-#endif
 
 	[Native]
 #if XAMCORE_2_0
diff --git a/src/UIKit/UIEnums.cs b/src/UIKit/UIEnums.cs
index 52d377f785..e76daeefbe 100644
--- a/src/UIKit/UIEnums.cs
+++ b/src/UIKit/UIEnums.cs
@@ -2281,7 +2281,8 @@ namespace XamCore.UIKit {
 		LayoutMargins,
 	}
 
-	[iOS (11,0), TV (11,0), Watch (4,0)]
+	[NoWatch][NoTV]
+	[iOS (11,0)]
 	[Native]
 	public enum UIPreferredPresentationStyle : nint
 	{
diff --git a/src/foundation.cs b/src/foundation.cs
index 73efd4592e..526d9ffde0 100644
--- a/src/foundation.cs
+++ b/src/foundation.cs
@@ -4923,6 +4923,7 @@ namespace XamCore.Foundation
 	[Since (5,0)]
 	[BaseType (typeof (NSObject))]
 #if WATCH
+	[Advice ("Not available on watchOS")]
 	[DisableDefaultCtor] // "NSUbiquitousKeyValueStore is unavailable" is printed to the log.
 #endif
 	interface NSUbiquitousKeyValueStore {
@@ -11400,16 +11401,20 @@ namespace XamCore.Foundation
 		NSString PowerStateDidChangeNotification { get; }
 #endif
 
-#if MONOMAC
 		[Mac (10,10,3)]
+		[Watch (4,0)]
+		[TV (11, 0)]
+		[iOS (11,0)]
 		[Export ("thermalState")]
 		NSProcessInfoThermalState ThermalState { get; }
 
 		[Mac (10,10,3)]
 		[Field ("NSProcessInfoThermalStateDidChangeNotification")]
+		[Watch (4,0)]
+		[TV (11, 0)]
+		[iOS (11,0)]
 		[Notification]
 		NSString ThermalStateDidChangeNotification { get; }
-#endif
 	}
 
 	[NoWatch][NoTV][NoiOS]
diff --git a/tests/xtro-sharpie/tvos.ignore b/tests/xtro-sharpie/tvos.ignore
index 09f21de4c9..b13d79ff93 100644
--- a/tests/xtro-sharpie/tvos.ignore
+++ b/tests/xtro-sharpie/tvos.ignore
@@ -376,6 +376,12 @@
 !missing-selector! UITableViewHeaderFooterView::setTintColor: not bound
 !missing-selector! UITableViewHeaderFooterView::tintColor not bound
 
+## lack of availabilty macros on NSItemProvder.PreferredPresentationStyle - intro says they are not available
+!missing-selector! NSItemProvider::preferredPresentationStyle not bound
+!missing-selector! NSItemProvider::setPreferredPresentationStyle: not bound
+## and that also means the (enum/returned) type is unused
+!missing-enum! UIPreferredPresentationStyle not bound
+
 
 # OpenTK
 
diff --git a/tests/xtro-sharpie/watchos.ignore b/tests/xtro-sharpie/watchos.ignore
index 06d96265b8..8d926c5167 100644
--- a/tests/xtro-sharpie/watchos.ignore
+++ b/tests/xtro-sharpie/watchos.ignore
@@ -158,6 +158,12 @@ AVAudioPlayerDelegate::audioPlayerEndInterruption:withOptions:
 !missing-selector! UIImageDeprecated::stretchableImageWithLeftCapWidth:topCapHeight: not bound
 !missing-selector! UIImageDeprecated::topCapHeight not bound
 
+## lack of availabilty macros on NSItemProvder.PreferredPresentationStyle - intro says they are not available
+!missing-selector! NSItemProvider::preferredPresentationStyle not bound
+!missing-selector! NSItemProvider::setPreferredPresentationStyle: not bound
+## and that also means the (enum/returned) type is unused
+!missing-enum! UIPreferredPresentationStyle not bound
+
 
 # WatchConnectivity
 
diff --git a/tests/xtro-sharpie/watchos.pending b/tests/xtro-sharpie/watchos.pending
index 0af032fed4..33a075b960 100644
--- a/tests/xtro-sharpie/watchos.pending
+++ b/tests/xtro-sharpie/watchos.pending
@@ -69,6 +69,12 @@
 !missing-protocol-conformance! CMSensorDataList should conform to NSFastEnumeration
 
 
+# Foundation
+
+## type was not marked as unavailable before Xcode9
+!unknown-type! NSUbiquitousKeyValueStore bound
+
+
 # HealthKit
 
 ## deprecated API (removed in same version it was added)