diff --git a/integrations/apple/example_app/iOS/Example_iOS_App/ViewController.swift b/integrations/apple/example_app/iOS/Example_iOS_App/ViewController.swift
index a586ec2..5a58ee8 100644
--- a/integrations/apple/example_app/iOS/Example_iOS_App/ViewController.swift
+++ b/integrations/apple/example_app/iOS/Example_iOS_App/ViewController.swift
@@ -92,9 +92,9 @@ class ViewController: UIViewController {
         // TCP
         if(selectedProtocol == SOCK_STREAM)
         {
-            sock = zt.socket(AF_INET, socket_type: SOCK_STREAM, socket_protocol: 0)
+            sock = zt.socket(AF_INET, SOCK_STREAM, 0)
             let ztaddr: ZTAddress = ZTAddress(family: AF_INET, addr: serverAddr, port: serverPort)
-            let connect_err = zt.connect(sock, addr: ztaddr)
+            let connect_err = zt.connect(sock, ztaddr)
             
             print("connect_err = \(connect_err),\(errno)")
             
@@ -129,9 +129,9 @@ class ViewController: UIViewController {
         // TCP
         if(selectedProtocol == SOCK_STREAM)
         {
-            sock = Int16(zt_socket(AF_INET, SOCK_STREAM, 0))
+            sock = zt_socket(AF_INET, SOCK_STREAM, 0)
             let ztaddr: ZTAddress = ZTAddress(family: AF_INET, addr: serverAddr, port: serverPort)
-            let bind_err = zt.bind(sock, addr: ztaddr)
+            let bind_err = zt.bind(sock, ztaddr)
             
             print("bind_err = \(bind_err),\(errno)")
             
@@ -148,7 +148,7 @@ class ViewController: UIViewController {
             var len:socklen_t = 0;
             var legIntPtr = withUnsafeMutablePointer(&len, { $0 })
             while(accepted_sock < 0) {
-                accepted_sock = zt.accept(sock, addr: ztaddr)
+                accepted_sock = zt.accept(sock, ztaddr)
             }
             print("accepted connection")
         }
@@ -158,11 +158,11 @@ class ViewController: UIViewController {
         {
             let ztaddr: ZTAddress = ZTAddress(family: AF_INET, addr: serverAddr, port: serverPort)
 
-            sock = Int16(zt_socket(AF_INET, SOCK_DGRAM, 0))
-            err = zt.bind(sock, addr: ztaddr)
+            sock = zt_socket(AF_INET, SOCK_DGRAM, 0)
+            err = zt.bind(sock, ztaddr)
             print("bind_err = ", err)
             
-            err = zt.listen(sock, backlog: 0)
+            err = zt.listen(sock, 0)
             print("listen_err = ", err)
         }
     }
@@ -278,6 +278,7 @@ class ViewController: UIViewController {
         
         selectedProtocol = SOCK_STREAM
         
+        sleep(3)
         print("Starting ZeroTier...\n");
         zt.start_service(nil);
         
diff --git a/src/SDK_Debug.h b/src/SDK_Debug.h
index ecf1fe1..a0321dc 100644
--- a/src/SDK_Debug.h
+++ b/src/SDK_Debug.h
@@ -69,6 +69,7 @@ extern "C" {
  #if DEBUG_LEVEL >= MSG_INFO
   #if defined(__ANDROID__)
     #define DEBUG_INFO(fmt, args...) ((void)__android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, "ZT_INFO : %s:%d:%s(): " fmt "\n", __FILENAME__, __LINE__, __FUNCTION__, ##args))
+    #define DEBUG_BLANK(fmt, args...) ((void)__android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, "ZT_INFO : %s:%d:" fmt "\n", __FILENAME__, __LINE__, __FUNCTION__, ##args))
   #else
     #define DEBUG_INFO(fmt, args...) fprintf(stderr, "ZT_INFO : %s:%d:%s(): " fmt "\n", __FILENAME__, __LINE__, __FUNCTION__, ##args)
     #define DEBUG_BLANK(fmt, args...) fprintf(stderr, "ZT_INFO : %s:%d:" fmt "\n", __FILENAME__, __LINE__, ##args)
diff --git a/src/ZTSDK.swift b/src/ZTSDK.swift
index 3eb0fe9..93a42ef 100644
--- a/src/ZTSDK.swift
+++ b/src/ZTSDK.swift
@@ -130,8 +130,8 @@ class ZTSDK : NSObject
     */
     
     // SOCKET API
-    func socket(socket_family: Int32,  _ socket_type: Int32, _ socket_protocol: Int32) -> Int16 {
-        return Int16(zt_socket(socket_family, socket_type, socket_protocol));
+    func socket(socket_family: Int32,  _ socket_type: Int32, _ socket_protocol: Int32) -> Int32 {
+        return zt_socket(socket_family, socket_type, socket_protocol);
     }
     
     func connect(fd: Int32, _ addr: ZTAddress) -> Int32 {