diff --git a/integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate b/integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate
index 8612e82..d2a7053 100644
Binary files a/integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate and b/integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate b/integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate
index f1ba41c..40b22cd 100644
Binary files a/integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate and b/integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/make-mac.mk b/make-mac.mk
index d61fd53..25181e1 100644
--- a/make-mac.mk
+++ b/make-mac.mk
@@ -49,7 +49,18 @@ endif
 
 CXXFLAGS=$(CFLAGS) -fno-rtti
 
-all: osx_app_framework ios_app_framework osx_unity3d_bundle ios_unity3d_bundle android_jni_lib osx_shared_lib check
+# Build everything
+all: osx ios android check
+
+# Build all iOS targets
+ios: ios_app_framework ios_unity3d_bundle
+
+# Build all OSX targets
+osx: osx_app_framework osx_unity3d_bundle osx_shared_lib
+
+# Build all Android targets 
+# Chip architectures can be specified in integrations/android/android_jni_lib/java/jni/Application.mk
+android: android_jni_lib
 
 # TODO: CHECK if XCODE TOOLS are installed
 # Build frameworks for application development
@@ -87,7 +98,8 @@ osx_shared_lib: remove_only_intermediates $(OBJS)
 	# Build liblwip.so which must be placed in ZT home for zerotier-sdk-service to work
 	make -f make-liblwip.mk
 	# Use gcc not clang to build standalone intercept library since gcc is typically used for libc and we want to ensure maximal ABI compatibility
-	cd src ; gcc $(DEFS) -O2 -Wall -std=c99 -fPIC -fno-common -dynamiclib -flat_namespace -DVERBOSE -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -I../zerotierone/node -nostdlib -shared -o $(BUILD)/libztintercept.so SDK_Sockets.c SDK_Intercept.c SDK_Debug.c SDK_RPC.c -ldl
+	cd src ; gcc $(DEFS) -O2 -Wall -std=c99 -fPIC -fno-common -dynamiclib -flat_namespace -DVERBOSE -D_GNU_SOURCE -DNETCON_INTERCEPT -I. -I../zerotierone/node -nostdlib -shared -o libztintercept.so SDK_Sockets.c SDK_Intercept.c SDK_Debug.c SDK_RPC.c -ldl
+	mv src/libztintercept.so $(BUILD)/osx_shared_lib/libztintercept.so
 	ln -sf zerotier-sdk-service zerotier-cli
 	ln -sf zerotier-sdk-service zerotier-idtool
 	cp docs/osx_zt_sdk.md $(BUILD)/osx_shared_lib/README.md
diff --git a/src/SDK_ServiceSetup.cpp b/src/SDK_ServiceSetup.cpp
index 09ec712..1ea1ca4 100644
--- a/src/SDK_ServiceSetup.cpp
+++ b/src/SDK_ServiceSetup.cpp
@@ -74,7 +74,7 @@ extern "C" {
     // Starts a service at the specified path
     void unity_start_service(char * path, int len) {
         Debug(path);
-        zt_init_rpc(path);
+        zt_init_rpc(path,"");
         init_service(INTERCEPT_DISABLED, path);
     }
 #endif
@@ -157,7 +157,7 @@ extern "C" {
         
             #if defined(__UNITY_3D__) && !defined(__ANDROID__) && !defined(__IOS__)
                 // Unity3D on a non-mobile platform
-                homeDir = "" + current_dir; // homeDir shall be current dir 
+                homeDir = current_dir; // homeDir shall be current dir
             #endif
 
             #if defined(__ANDROID__)
diff --git a/src/SDK_Sockets.c b/src/SDK_Sockets.c
index c32d4b0..5686fa7 100644
--- a/src/SDK_Sockets.c
+++ b/src/SDK_Sockets.c
@@ -76,6 +76,7 @@
 void dwr(int level, const char *fmt, ... );
 char *api_netpath = (char *)0;
 void load_symbols();
+void load_symbols_rpc();
 int (*realclose)(CLOSE_SIG);
 
     // ------------------------------------------------------------------------------