diff --git a/app/src/main/java/com/limelight/Game.java b/app/src/main/java/com/limelight/Game.java
index 5c5de4d2..6d87c8dc 100644
--- a/app/src/main/java/com/limelight/Game.java
+++ b/app/src/main/java/com/limelight/Game.java
@@ -230,12 +230,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 .setRemote(remote)
                 .setHevcSupported(decoderRenderer.isHevcSupported())
                 .setAudioConfiguration(prefConfig.enable51Surround ?
-                        StreamConfiguration.AUDIO_CONFIGURATION_5_1 :
-                        StreamConfiguration.AUDIO_CONFIGURATION_STEREO)
+                        MoonBridge.AUDIO_CONFIGURATION_51_SURROUND :
+                        MoonBridge.AUDIO_CONFIGURATION_STEREO)
                 .build();
 
         // Initialize the connection
-        conn = new NvConnection(host, uniqueId, Game.this, config, PlatformBinding.getCryptoProvider(this));
+        conn = new NvConnection(host, uniqueId, config, PlatformBinding.getCryptoProvider(this));
         controllerHandler = new ControllerHandler(this, conn, this, prefConfig.multiController, prefConfig.deadzonePercentage);
 
         InputManager inputManager = (InputManager) getSystemService(Context.INPUT_SERVICE);
@@ -971,7 +971,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             connecting = true;
 
             decoderRenderer.setRenderTarget(holder);
-            conn.start(PlatformBinding.getAudioRenderer(), decoderRenderer);
+            conn.start(PlatformBinding.getAudioRenderer(), decoderRenderer, Game.this);
         }
     }
 
diff --git a/app/src/main/java/com/limelight/binding/audio/AndroidAudioRenderer.java b/app/src/main/java/com/limelight/binding/audio/AndroidAudioRenderer.java
index 017a9729..d1bb1539 100644
--- a/app/src/main/java/com/limelight/binding/audio/AndroidAudioRenderer.java
+++ b/app/src/main/java/com/limelight/binding/audio/AndroidAudioRenderer.java
@@ -89,9 +89,4 @@ public class AndroidAudioRenderer implements AudioRenderer {
             track.release();
         }
     }
-
-    @Override
-    public int getCapabilities() {
-        return 0;
-    }
 }
diff --git a/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java b/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
index 14291739..f5eca790 100644
--- a/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
+++ b/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
@@ -611,16 +611,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         LimeLog.info("SPS replay complete");
     }
 
-    @Override
-    public int getCapabilities() {
-        int caps = 0;
-
-        caps |= directSubmit ?
-                MoonBridge.CAPABILITY_DIRECT_SUBMIT : 0;
-
-        return caps;
-    }
-
     public int getAverageEndToEndLatency() {
         if (totalFrames == 0) {
             return 0;
diff --git a/moonlight-common b/moonlight-common
index f5b8743d..bdaed571 160000
--- a/moonlight-common
+++ b/moonlight-common
@@ -1 +1 @@
-Subproject commit f5b8743d693af4884e65f45243a8507fc598f40d
+Subproject commit bdaed5712289ba1878f646e7b3d5ddd5332dcae6