diff --git a/internal/crypto/BUILD b/internal/crypto/BUILD
index 68558128..2f96db1a 100644
--- a/internal/crypto/BUILD
+++ b/internal/crypto/BUILD
@@ -44,8 +44,6 @@ cc_test(
     srcs = ["ed25519_unittest.cc"],
     copts = [
         "-DUNIT_TEST",
-        "-Wno-inconsistent-missing-override",
-        "-Wno-non-virtual-dtor",
         "-Ithird_party",
     ],
     deps = [
diff --git a/internal/crypto_cros/BUILD b/internal/crypto_cros/BUILD
index 3f61a913..d1a06ea1 100644
--- a/internal/crypto_cros/BUILD
+++ b/internal/crypto_cros/BUILD
@@ -99,8 +99,6 @@ cc_test(
     ],
     copts = [
         "-DUNIT_TEST",
-        "-Wno-inconsistent-missing-override",
-        "-Wno-non-virtual-dtor",
         "-Ithird_party",
     ],
     deps = [
diff --git a/internal/platform/implementation/apple/Mediums/BLE/Sockets/BUILD b/internal/platform/implementation/apple/Mediums/BLE/Sockets/BUILD
index 97954b96..0146d5a8 100644
--- a/internal/platform/implementation/apple/Mediums/BLE/Sockets/BUILD
+++ b/internal/platform/implementation/apple/Mediums/BLE/Sockets/BUILD
@@ -30,9 +30,6 @@ objc_library(
     ]) + [
         "Source/GNSCentral.h",
     ],
-    copts = [
-        "-Wno-enum-compare",  # TODO(b/418286948): Remove this when the error is fixed.
-    ],
     deps = [
         ":Shared",
         "//internal/platform/implementation/apple/Log:GNCLogger",
@@ -51,9 +48,6 @@ objc_library(
     ]) + [
         "Source/GNSPeripheral.h",
     ],
-    copts = [
-        "-Wno-enum-compare",  # TODO(b/418286948): Remove this when the error is fixed.
-    ],
     deps = [
         ":Shared",
         "//internal/platform/implementation/apple/Log:GNCLogger",
diff --git a/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralManager.m b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralManager.m
index d58d1759..af6e7e8b 100644
--- a/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralManager.m
+++ b/internal/platform/implementation/apple/Mediums/BLE/Sockets/Source/Peripheral/GNSPeripheralManager.m
@@ -371,7 +371,7 @@ static NSTimeInterval gKBTCrashLoopMaxTimeBetweenResetting = 15.f;
 }
 
 - (void)updateBTCrashLoopHeuristic {
-  NSAssert(_cbPeripheralManager.state == CBCentralManagerStateResetting, @"Unexpected CB state %@",
+  NSAssert(_cbPeripheralManager.state == CBManagerStateResetting, @"Unexpected CB state %@",
            CBManagerStateString(_cbPeripheralManager.state));
   NSDate *now = [NSDate date];
   if ([now timeIntervalSinceDate:_btCrashLastResettingDate] >