diff --git a/FBDeviceControl/Management/FBAMDefines.h b/FBDeviceControl/Management/FBAMDefines.h
index d39d4f8b0..64735136d 100644
--- a/FBDeviceControl/Management/FBAMDefines.h
+++ b/FBDeviceControl/Management/FBAMDefines.h
@@ -46,7 +46,7 @@ typedef NS_ENUM(int, AMDeviceNotificationType) {
  A Notification structure.
  */
 typedef struct {
-  AMDeviceRef amDevice;
+  AMDeviceRef _Nonnull amDevice;
   AMDeviceNotificationType status;
 } AMDeviceNotification;
 
diff --git a/fbsimctl/FBSimulatorControlKit/Sources/CLIBootstrapper.swift b/fbsimctl/FBSimulatorControlKit/Sources/CLIBootstrapper.swift
index bc8d29736..c2c93fd3a 100644
--- a/fbsimctl/FBSimulatorControlKit/Sources/CLIBootstrapper.swift
+++ b/fbsimctl/FBSimulatorControlKit/Sources/CLIBootstrapper.swift
@@ -11,7 +11,7 @@ import FBSimulatorControl
 import Foundation
 
 @objc open class CLIBootstrapper: NSObject {
-  open static func bootstrap() -> Int32 {
+  @objc public static func bootstrap() -> Int32 {
     let arguments = Array(CommandLine.arguments.dropFirst(1))
     let environment = ProcessInfo.processInfo.environment
     let (cli, writer, reporter, _) = CLI.fromArguments(arguments, environment: environment).bootstrap()