diff --git a/Source/ASButtonNode.mm b/Source/ASButtonNode.mm
index e6878f80..5e420792 100644
--- a/Source/ASButtonNode.mm
+++ b/Source/ASButtonNode.mm
@@ -52,10 +52,12 @@
   ASLockScopeSelf();
   if (!_titleNode) {
     _titleNode = [[ASTextNode alloc] init];
-    #if TARGET_OS_IOS
-          // tvOS needs access to the underlying view
-          // of the button node to add a touch handler.
-        [_titleNode setLayerBacked:YES];
+    #if TARGET_OS_TV
+      // tvOS needs access to the underlying view
+      // of the button node to add a touch handler.
+      [_titleNode setLayerBacked:NO];
+    #else
+      [_titleNode setLayerBacked:YES];
     #endif
     _titleNode.style.flexShrink = 1.0;
     _titleNode.textColorFollowsTintColor = YES;
diff --git a/Source/Private/ASDisplayNode+UIViewBridge.mm b/Source/Private/ASDisplayNode+UIViewBridge.mm
index 6d344255..1234f2d6 100644
--- a/Source/Private/ASDisplayNode+UIViewBridge.mm
+++ b/Source/Private/ASDisplayNode+UIViewBridge.mm
@@ -795,32 +795,36 @@ if (shouldApply) { _layer.layerProperty = (layerValueExpr); } else { ASDisplayNo
 
 - (UIColor *)tintColor
 {
-  _bridge_prologue_read;
+  __instanceLock__.lock();
+  UIColor *retVal;
   if (_loaded(self)) {
     if (_flags.layerBacked) {
-        // The first nondefault tint color value in the view’s hierarchy, ascending from and starting with the view itself.
-        return _tintColor ?: self.supernode.tintColor;
-      } else {
-        return _getFromViewOnly(tintColor);
-      }
+      // The first nondefault tint color value in the view’s hierarchy, ascending from and starting with the view itself.
+      retVal = _tintColor;
+    } else {
+      retVal = _getFromViewOnly(tintColor);
+    }
   } else {
     if (_flags.layerBacked) {
-      return _tintColor;
+      retVal = _tintColor;
     } else {
-      return ASDisplayNodeGetPendingState(self).tintColor;
+      retVal = ASDisplayNodeGetPendingState(self).tintColor;
     }
   }
+  __instanceLock__.unlock();
+  return retVal ?: self.supernode.tintColor;
 }
 
 - (void)setTintColor:(UIColor *)color
 {
-  _bridge_prologue_write;
+  // Handle locking manually since we unlock to notify subclasses when tint color changes
+  __instanceLock__.lock();
   if (_loaded(self)) {
     if (_flags.layerBacked) {
       if (![_tintColor isEqual:color]) {
         _tintColor = color;
         // Tint color has changed. Unlock here before calling subclasses and exit-early
-        AS::MutexLocker unlock(__instanceLock__);
+        __instanceLock__.unlock();
         [self tintColorDidChange];
         return;
       }
@@ -834,6 +838,7 @@ if (shouldApply) { _layer.layerProperty = (layerValueExpr); } else { ASDisplayNo
       ASDisplayNodeGetPendingState(self).tintColor = color;
     }
   }
+  __instanceLock__.unlock();
 }
 
 - (void)tintColorDidChange