diff --git a/scripts/build/lib.sh b/scripts/build/lib.sh
index a1e70a190..0ba4109e0 100755
--- a/scripts/build/lib.sh
+++ b/scripts/build/lib.sh
@@ -8,6 +8,10 @@ function setup_runner() {
     local app_profile_file="$2"
     local ne_profile="$3"
     local ne_profile_file="$4"
+
+    # Use the latest version of Xcode - matches what we typically use for development
+    sudo xcode-select --switch "$(ls -d /Applications/Xcode*.app | sort -V | tail -n 1)"
+
     profiles_path="$HOME/Library/Developer/Xcode/UserData/Provisioning Profiles"
     keychain_pass=$(openssl rand -base64 32)
     keychain_path="$(mktemp -d)/app-signing.keychain-db"
diff --git a/swift/apple/FirezoneNetworkExtension/BindResolvers.swift b/swift/apple/FirezoneNetworkExtension/BindResolvers.swift
index d750b131f..3867e1b03 100644
--- a/swift/apple/FirezoneNetworkExtension/BindResolvers.swift
+++ b/swift/apple/FirezoneNetworkExtension/BindResolvers.swift
@@ -10,17 +10,17 @@ public class BindResolvers {
   var state = __res_9_state()
 
   public init() {
-    res_9_ninit(&state)
+    res_9_ninit(state)
   }
 
   deinit {
-    res_9_ndestroy(&state)
+    res_9_ndestroy(state)
   }
 
   public final func getservers() -> [res_9_sockaddr_union] {
     let maxServers = 10
     var servers = [res_9_sockaddr_union](repeating: res_9_sockaddr_union(), count: maxServers)
-    let found = Int(res_9_getservers(&state, &servers, Int32(maxServers)))
+    let found = Int(res_9_getservers(state, &servers, Int32(maxServers)))
 
     // filter is to remove the erroneous empty entry when there's no real servers
     return Array(servers[0..<found]).filter { $0.sin.sin_len > 0 }