diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm
index d4ff7e6499..5634fbc7ad 100644
--- a/AsyncDisplayKit/ASDisplayNode.mm
+++ b/AsyncDisplayKit/ASDisplayNode.mm
@@ -39,6 +39,10 @@ NSInteger const ASDefaultDrawingPriority = ASDefaultTransactionPriority;
 NSString * const ASRenderingEngineDidDisplayScheduledNodesNotification = @"ASRenderingEngineDidDisplayScheduledNodes";
 NSString * const ASRenderingEngineDidDisplayNodesScheduledBeforeTimestamp = @"ASRenderingEngineDidDisplayNodesScheduledBeforeTimestamp";
 
+// Forward declare CALayerDelegate protocol as the iOS 10 SDK moves CALayerDelegate from a formal delegate to a protocol.
+// We have to forward declare the protocol as this place otherwise it will not compile compiling with an Base SDK < iOS 10
+@protocol CALayerDelegate;
+
 @interface ASDisplayNode () <UIGestureRecognizerDelegate, _ASDisplayLayerDelegate, _ASTransitionContextCompletionDelegate>
 
 /**
@@ -493,7 +497,8 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
   if (isLayerBacked) {
     TIME_SCOPED(_debugTimeToCreateView);
     _layer = [self _layerToLoad];
-    _layer.delegate = self;
+    // Surpress warning for Base SDK > 10.0
+    _layer.delegate = (id<CALayerDelegate>)self;
   } else {
     TIME_SCOPED(_debugTimeToCreateView);
     _view = [self _viewToLoad];
diff --git a/AsyncDisplayKit/TextKit/ASTextKitCoreTextAdditions.m b/AsyncDisplayKit/TextKit/ASTextKitCoreTextAdditions.m
index 5d0337cd5f..d157cb4797 100644
--- a/AsyncDisplayKit/TextKit/ASTextKitCoreTextAdditions.m
+++ b/AsyncDisplayKit/TextKit/ASTextKitCoreTextAdditions.m
@@ -223,9 +223,12 @@ NSAttributedString *ASCleanseAttributedStringOfCoreTextAttributes(NSAttributedSt
 
   // kCTParagraphStyleSpecifierLineSpacing -> lineSpacing
   // Note that kCTParagraphStyleSpecifierLineSpacing is deprecated and will die soon. We should not be using it.
-  CGFloat lineSpacing;
-  if (CTParagraphStyleGetValueForSpecifier(coreTextParagraphStyle, kCTParagraphStyleSpecifierLineSpacing, sizeof(lineSpacing), &lineSpacing))
-    newParagraphStyle.lineSpacing = lineSpacing;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    CGFloat lineSpacing;
+    if (CTParagraphStyleGetValueForSpecifier(coreTextParagraphStyle, kCTParagraphStyleSpecifierLineSpacing, sizeof(lineSpacing), &lineSpacing))
+        newParagraphStyle.lineSpacing = lineSpacing;
+#pragma clang diagnostic pop
 
   // kCTParagraphStyleSpecifierParagraphSpacing -> paragraphSpacing
   CGFloat paragraphSpacing;
diff --git a/AsyncDisplayKitTests/ASDisplayNodeTests.m b/AsyncDisplayKitTests/ASDisplayNodeTests.m
index 86529730f3..1d58b9ccc4 100644
--- a/AsyncDisplayKitTests/ASDisplayNodeTests.m
+++ b/AsyncDisplayKitTests/ASDisplayNodeTests.m
@@ -160,7 +160,7 @@ for (ASDisplayNode *n in @[ nodes ]) {\
 @end
 
 @interface UIResponderNodeTestView : _ASDisplayView
-@property(nonatomic) BOOL isFirstResponder;
+@property(nonatomic) BOOL testIsFirstResponder;
 @end
 
 @implementation UIDisplayNodeTestView
@@ -192,7 +192,7 @@ for (ASDisplayNode *n in @[ nodes ]) {\
 @implementation UIResponderNodeTestView
 
 - (BOOL)becomeFirstResponder {
-  self.isFirstResponder = YES;
+  self.testIsFirstResponder = YES;
   return YES;
 }
 
@@ -202,8 +202,8 @@ for (ASDisplayNode *n in @[ nodes ]) {\
 
 - (BOOL)resignFirstResponder {
   [super resignFirstResponder];
-  if (self.isFirstResponder) {
-    self.isFirstResponder = NO;
+  if (self.testIsFirstResponder) {
+    self.testIsFirstResponder = NO;
     return YES;
   }
   return NO;