  void XPCMessageServer::ReceiveMessage() {
    IPCMessage request;
 +#ifndef MAS_BUILD
-   int rv = xpc_pipe_receive(server_port_, &request.xpc);
+   int rv = xpc_pipe_receive(server_port_.get(), &request.xpc);
    if (rv) {
      LOG(ERROR) << "Failed to xpc_pipe_receive(): " << rv;
      return;

diff --git a/sandbox/mac/launchd_interception_server.cc b/sandbox/mac/launchd_interception_server.cc
index f466e77..e69c7d1 100644
--- a/sandbox/mac/launchd_interception_server.cc
+++ b/sandbox/mac/launchd_interception_server.cc
@@ -169,8 +169,10 @@ void LaunchdInterceptionServer::ForwardMessage(IPCMessage request) {

     // On non-XPC launchd systems, bootstrap_look_up() is MIG-based and
     // generally safe.
diff --git a/sandbox/mac/xpc_message_server.cc b/sandbox/mac/xpc_message_server.cc
index d811e5d..df21859 100644
--- a/sandbox/mac/xpc_message_server.cc
+++ b/sandbox/mac/xpc_message_server.cc
@@ -50,7 +50,9 @@ bool XPCMessageServer::Initialize() {
