diff --git a/Source/Base/ASAssert.h b/Source/Base/ASAssert.h
index 336ac3d0e..636ef45f2 100644
--- a/Source/Base/ASAssert.h
+++ b/Source/Base/ASAssert.h
@@ -21,7 +21,11 @@
 #import <pthread.h>
 #import <AsyncDisplayKit/ASBaseDefines.h>
 
-#define ASDISPLAYNODE_ASSERTIONS_ENABLED (!defined(NS_BLOCK_ASSERTIONS))
+#if !defined(NS_BLOCK_ASSERTIONS)
+  #define ASDISPLAYNODE_ASSERTIONS_ENABLED 1
+#else
+  #define ASDISPLAYNODE_ASSERTIONS_ENABLED 0
+#endif
 
 /**
  * Note: In some cases it would be sufficient to do e.g.:
diff --git a/Source/Private/ASDefaultPlaybackButton.m b/Source/Private/ASDefaultPlaybackButton.m
index c2201b84a..bb5c8f539 100644
--- a/Source/Private/ASDefaultPlaybackButton.m
+++ b/Source/Private/ASDefaultPlaybackButton.m
@@ -46,15 +46,15 @@ - (void)setButtonType:(ASDefaultPlaybackButtonType)buttonType
   }
 }
 
-- (nullable id<NSObject>)drawParametersForAsyncLayer:(_ASDisplayLayer *)layer
+- (nullable NSDictionary *)drawParametersForAsyncLayer:(_ASDisplayLayer *)layer
 {
   return @{
-    @"buttonType" : [NSNumber numberWithInt:_buttonType],
+    @"buttonType" : @(self.buttonType),
     @"color" : self.tintColor
   };
 }
 
-+ (void)drawRect:(CGRect)bounds withParameters:(id)parameters isCancelled:(asdisplaynode_iscancelled_block_t)isCancelledBlock isRasterizing:(BOOL)isRasterizing
++ (void)drawRect:(CGRect)bounds withParameters:(NSDictionary *)parameters isCancelled:(asdisplaynode_iscancelled_block_t)isCancelledBlock isRasterizing:(BOOL)isRasterizing
 {
   ASDefaultPlaybackButtonType buttonType = (ASDefaultPlaybackButtonType)[parameters[@"buttonType"] intValue];
   UIColor *color = parameters[@"color"];