diff --git a/AsyncDisplayKit/ASMapNode.h b/AsyncDisplayKit/ASMapNode.h
index e5fcbd4921..eb450b1c25 100644
--- a/AsyncDisplayKit/ASMapNode.h
+++ b/AsyncDisplayKit/ASMapNode.h
@@ -9,6 +9,8 @@
 #import <AsyncDisplayKit/AsyncDisplayKit.h>
 #import <MapKit/MapKit.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ASMapNode : ASImageNode
 
 - (instancetype)initWithCoordinate:(CLLocationCoordinate2D)coordinate NS_DESIGNATED_INITIALIZER;
@@ -16,7 +18,7 @@
 /**
  This is the MKMapView that is the live map part of ASMapNode. This will be nil if .liveMap = NO. Note, MKMapView is *not* thread-safe.
  */
-@property (nonatomic, readonly) MKMapView *mapView;
+@property (nullable, nonatomic, readonly) MKMapView *mapView;
 
 /**
  Set this to YES to turn the snapshot into an interactive MKMapView and vice versa. Defaults to NO.
@@ -38,6 +40,8 @@
  * @discussion This method set the annotations of the static map view and also to the live map view. Passing an empty array clears the map of any annotations.
  * @param annotations An array of objects that conform to the MKAnnotation protocol
  */
-- (void)setAnnotations:(NSArray *)annotations;
+- (void)setAnnotations:(NSArray<id<MKAnnotation>> *)annotations;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h b/AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h
index 58cc12c35c..dcc2ea26f2 100644
--- a/AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h
+++ b/AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h
@@ -19,6 +19,8 @@
 #import "ASThread.h"
 #import "ASLayoutOptions.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 /**
  Hierarchy state is propogated from nodes to all of their children when certain behaviors are required from the subtree.
  Examples include rasterization and external driving of the .interfaceState property.
@@ -101,9 +103,11 @@ typedef NS_OPTIONS(NSUInteger, ASHierarchyState)
 @end
 
 @interface UIView (ASDisplayNodeInternal)
-@property (nonatomic, assign, readwrite) ASDisplayNode *asyncdisplaykit_node;
+@property (nullable, nonatomic, assign, readwrite) ASDisplayNode *asyncdisplaykit_node;
 @end
 
 @interface CALayer (ASDisplayNodeInternal)
-@property (nonatomic, assign, readwrite) ASDisplayNode *asyncdisplaykit_node;
+@property (nullable, nonatomic, assign, readwrite) ASDisplayNode *asyncdisplaykit_node;
 @end
+
+NS_ASSUME_NONNULL_END