diff --git a/moonlight-common/src/main/java/com/limelight/nvstream/StreamConfiguration.java b/moonlight-common/src/main/java/com/limelight/nvstream/StreamConfiguration.java
index 8014983f..991a36e3 100644
--- a/moonlight-common/src/main/java/com/limelight/nvstream/StreamConfiguration.java
+++ b/moonlight-common/src/main/java/com/limelight/nvstream/StreamConfiguration.java
@@ -5,7 +5,11 @@ import com.limelight.nvstream.jni.MoonBridge;
 
 public class StreamConfiguration {
 	public static final int INVALID_APP_ID = 0;
-	
+
+	public static final int STREAM_CFG_LOCAL = 0;
+	public static final int STREAM_CFG_REMOTE = 1;
+	public static final int STREAM_CFG_AUTO = 2;
+
 	private static final int CHANNEL_COUNT_STEREO = 2;
 	private static final int CHANNEL_COUNT_5_1 = 6;
 	
@@ -21,7 +25,7 @@ public class StreamConfiguration {
 	private boolean enableAdaptiveResolution;
 	private boolean playLocalAudio;
 	private int maxPacketSize;
-	private boolean remote;
+	private int remote;
 	private int audioChannelMask;
 	private int audioChannelCount;
 	private int audioConfiguration;
@@ -38,7 +42,7 @@ public class StreamConfiguration {
 			return this;
 		}
 		
-		public StreamConfiguration.Builder setRemote(boolean remote) {
+		public StreamConfiguration.Builder setRemoteConfiguration(int remote) {
 			config.remote = remote;
 			return this;
 		}
@@ -145,6 +149,7 @@ public class StreamConfiguration {
 		this.refreshRate = 60;
 		this.bitrate = 10000;
 		this.maxPacketSize = 1024;
+		this.remote = STREAM_CFG_AUTO;
 		this.sops = true;
 		this.enableAdaptiveResolution = false;
 		this.audioChannelCount = CHANNEL_COUNT_STEREO;
@@ -190,7 +195,7 @@ public class StreamConfiguration {
 		return playLocalAudio;
 	}
 	
-	public boolean getRemote() {
+	public int getRemote() {
 		return remote;
 	}
 	
diff --git a/moonlight-common/src/main/java/com/limelight/nvstream/jni/MoonBridge.java b/moonlight-common/src/main/java/com/limelight/nvstream/jni/MoonBridge.java
index 49105f72..0e0e20d5 100644
--- a/moonlight-common/src/main/java/com/limelight/nvstream/jni/MoonBridge.java
+++ b/moonlight-common/src/main/java/com/limelight/nvstream/jni/MoonBridge.java
@@ -170,7 +170,7 @@ public class MoonBridge {
 
     public static native int startConnection(String address, String appVersion, String gfeVersion,
                                               int width, int height, int fps,
-                                              int bitrate, int packetSize, boolean streamingRemotely,
+                                              int bitrate, int packetSize, int streamingRemotely,
                                               int audioConfiguration, boolean supportsHevc,
                                               boolean enableHdr,
                                               int hevcBitratePercentageMultiplier,
diff --git a/moonlight-common/src/main/jni/moonlight-core/callbacks.c b/moonlight-common/src/main/jni/moonlight-core/callbacks.c
index 9ba841d3..a285a925 100644
--- a/moonlight-common/src/main/jni/moonlight-core/callbacks.c
+++ b/moonlight-common/src/main/jni/moonlight-core/callbacks.c
@@ -401,7 +401,7 @@ JNIEXPORT jint JNICALL
 Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jclass clazz,
                                                            jstring address, jstring appVersion, jstring gfeVersion,
                                                            jint width, jint height, jint fps,
-                                                           jint bitrate, jint packetSize, jboolean streamingRemotely,
+                                                           jint bitrate, jint packetSize, jint streamingRemotely,
                                                            jint audioConfiguration, jboolean supportsHevc,
                                                            jboolean enableHdr,
                                                            jint hevcBitratePercentageMultiplier,
diff --git a/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c b/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c
index 8665d806..639ff18d 160000
--- a/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c
+++ b/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c
@@ -1 +1 @@
-Subproject commit 8665d806978d2cba9c9040183a3686f4d87d402c
+Subproject commit 639ff18dbbcde35ca918c2e898e20bd2a624fdc5