diff --git a/Directory.build.props b/Directory.build.props
index 287dfc9e..0ee5d38d 100644
--- a/Directory.build.props
+++ b/Directory.build.props
@@ -13,7 +13,7 @@
     <RepositoryType>git</RepositoryType>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
     <NeutralLanguage>en</NeutralLanguage>
-    <Version>2.8.1</Version>
+    <Version>2.8.1.1</Version>
 
     <LangVersion>latest</LangVersion>
     <NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;CS0109;CS0108;CS0618;CS0114</NoWarn>
diff --git a/ExoPlayer.Core/Transforms/Metadata.xml b/ExoPlayer.Core/Transforms/Metadata.xml
index 5bcfb5fa..60636e01 100644
--- a/ExoPlayer.Core/Transforms/Metadata.xml
+++ b/ExoPlayer.Core/Transforms/Metadata.xml
@@ -91,7 +91,18 @@
 
     <attr name="type" path="/api/package[@name='com.google.android.exoplayer2']/interface[@name='RenderersFactory']/method[@name='createRenderers' and count(parameter)=6 and parameter[6]]">java.lang.Object</attr>
 
+    <attr path="/api/package[@name='com.google.android.exoplayer2.audio']/class[@name='AudioRendererEventListener.EventDispatcher']/method[@name='enabled' and count(parameter)=1 and parameter[1][@type='com.google.android.exoplayer2.decoder.DecoderCounters']]" name="managedName" >InvokeEnabled</attr>
+    <attr path="/api/package[@name='com.google.android.exoplayer2.audio']/class[@name='AudioRendererEventListener.EventDispatcher']/method[@name='disabled' and count(parameter)=1 and parameter[1][@type='com.google.android.exoplayer2.decoder.DecoderCounters']]" name="managedName" >InvokeDisabled</attr>
+    <attr path="/api/package[@name='com.google.android.exoplayer2.audio']/class[@name='AudioRendererEventListener.EventDispatcher']/method[@name='inputFormatChanged' and count(parameter)=1 and parameter[1][@type='com.google.android.exoplayer2.Format']]" name="managedName" >InvokeInputFormatChanged</attr>
+    <attr path="/api/package[@name='com.google.android.exoplayer2.audio']/class[@name='AudioRendererEventListener.EventDispatcher']/method[@name='audioTrackUnderrun' and count(parameter)=3 and parameter[1][@type='int'] and parameter[2][@type='long'] and parameter[3][@type='long']]" name="managedName" >InvokeAudioTrackUnderrun</attr>
+    
     <remove-node path="/api/package[@name='com.google.android.exoplayer2.analytics']/interface[@name='AnalyticsListener']/method[@name='onVideoSizeChanged']" />
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2.analytics']/interface[@name='AnalyticsListener']/method[@name='onAudioSessionId']" />
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2.analytics']/interface[@name='AnalyticsListener']/method[@name='onAudioUnderrun']" />
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2.analytics']/interface[@name='AnalyticsListener']/method[@name='onDecoderInitialized']" />
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2.analytics']/interface[@name='AnalyticsListener']/method[@name='onDecoderEnabled']" />
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2.analytics']/interface[@name='AnalyticsListener']/method[@name='onDecoderDisabled']" />
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2.analytics']/interface[@name='AnalyticsListener']/method[@name='onDecoderInputFormatChanged']" />
     <remove-node path="/api/package[@name='com.google.android.exoplayer2.analytics']/interface[@name='AnalyticsListener']/method[@name='onRenderedFirstFrame']" />
 
     <!-- remove dupes -->
@@ -114,4 +125,10 @@
     <remove-node path="/api/package[@name='com.google.android.exoplayer2.offline']/class[@name='DownloadHelper']/method[@name='getDownloadAction' and count(parameter)=2 and parameter[1][@type='byte[]'] and parameter[2][@type='java.util.List&lt;com.google.android.exoplayer2.offline.TrackKey&gt;']]" />
     <remove-node path="/api/package[@name='com.google.android.exoplayer2.offline']/class[@name='ProgressiveDownloadHelper']/method[@name='getDownloadAction' and count(parameter)=2 and parameter[1][@type='byte[]'] and parameter[2][@type='java.util.List&lt;com.google.android.exoplayer2.offline.TrackKey&gt;']]" />
 
+    <!--  Need to remove becayse Java messes up  -->
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2.analytics']/class[@name='AnalyticsCollector']" />
+
+    <!-- Need to remove for AdsLoader -->
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2.source.ads']/interface[@name='AdsLoader']/method[@name='handlePrepareError' and count(parameter)=3 and parameter[1][@type='int'] and parameter[2][@type='int'] and parameter[3][@type='java.io.IOException']]" />
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2.source.ads']/interface[@name='AdsLoader']/method[@name='setSupportedContentTypes' and count(parameter)=1 and parameter[1][@type='int...']]" />
 </metadata>
diff --git a/ExoPlayer.Dash/Transforms/Metadata.xml b/ExoPlayer.Dash/Transforms/Metadata.xml
index 7ce4c3b9..b242f38a 100644
--- a/ExoPlayer.Dash/Transforms/Metadata.xml
+++ b/ExoPlayer.Dash/Transforms/Metadata.xml
@@ -25,5 +25,10 @@
     
     <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.source.dash.manifest']/class[@name='DashManifest']/method[@name='copy' and count(parameter)=1 and parameter[1][@type='java.util.List&lt;com.google.android.exoplayer2.source.dash.manifest.RepresentationKey&gt;']]">java.lang.Object</attr>
     <attr name="type" path="/api/package[@name='com.google.android.exoplayer2.source.dash.manifest']/class[@name='DashManifest']/method[@name='copy' and count(parameter)=1 and parameter[1][@type='java.util.List&lt;com.google.android.exoplayer2.source.dash.manifest.RepresentationKey&gt;']]/parameter[1]">System.Collections.IList</attr>
+
+    <!-- Only in debug mode  -->
+    <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.source.dash.offline']/class[@name='DashDownloader']/method[@name='getAllRepresentationKeys' and count(parameter)=0]">Java.Lang.Object[]</attr>
+    <attr name="type" path="/api/package[@name='com.google.android.exoplayer2.source.dash.offline']/class[@name='DashDownloader']/method[@name='getSegments']/parameter[@name='keys']">java.lang.Object[]</attr>
+    <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.source.dash.manifest']/class[@name='FilteringDashManifestParser']/method[@name='parse' and count(parameter)=2 and parameter[1][@type='android.net.Uri'] and parameter[2][@type='java.io.InputStream']]">java.lang.Object</attr>
     
 </metadata>
diff --git a/ExoPlayer.Ext.Ima/Transforms/Metadata.xml b/ExoPlayer.Ext.Ima/Transforms/Metadata.xml
index 8023b4e3..ef5e083e 100644
--- a/ExoPlayer.Ext.Ima/Transforms/Metadata.xml
+++ b/ExoPlayer.Ext.Ima/Transforms/Metadata.xml
@@ -2,4 +2,7 @@
 <metadata>
     <attr name="visibility" path="/api/package[@name='com.google.android.exoplayer2.ext.ima']/class[@name='ImaAdsMediaSource']/method[@name='prepareSourceInternal' and count(parameter)=2 and parameter[1][@type='com.google.android.exoplayer2.ExoPlayer'] and parameter[2][@type='boolean']]">protected</attr>
     <attr name="visibility" path="/api/package[@name='com.google.android.exoplayer2.ext.ima']/class[@name='ImaAdsMediaSource']/method[@name='releaseSourceInternal' and count(parameter)=0]">protected</attr>
+
+    <!-- Only in debug mode  -->
+
 </metadata>
\ No newline at end of file
diff --git a/ExoPlayer.Hls/Transforms/Metadata.xml b/ExoPlayer.Hls/Transforms/Metadata.xml
index 847cbafa..3fe222ac 100644
--- a/ExoPlayer.Hls/Transforms/Metadata.xml
+++ b/ExoPlayer.Hls/Transforms/Metadata.xml
@@ -32,4 +32,10 @@
 
     <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.source.hls.playlist']/class[@name='HlsMasterPlaylist']/method[@name='copy' and count(parameter)=1 and parameter[1][@type='java.util.List&lt;com.google.android.exoplayer2.source.hls.playlist.RenditionKey&gt;']]">java.lang.Object</attr>
     <attr name="type" path="/api/package[@name='com.google.android.exoplayer2.source.hls.playlist']/class[@name='HlsMasterPlaylist']/method[@name='copy' and count(parameter)=1 and parameter[1][@type='java.util.List&lt;com.google.android.exoplayer2.source.hls.playlist.RenditionKey&gt;']]/parameter[1]">System.Collections.IList</attr>
+
+    <!-- Only in debug mode  -->
+    <attr name="type" path="/api/package[@name='com.google.android.exoplayer2.source.hls.offline']/class[@name='HlsDownloader']/method[@name='getSegments']/parameter[@name='keys']">java.lang.Object[]</attr>
+    <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.source.hls.offline']/class[@name='HlsDownloader']/method[@name='getAllRepresentationKeys' and count(parameter)=0]">Java.Lang.Object[]</attr>
+    <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.source.hls.playlist']/class[@name='FilteringHlsPlaylistParser']/method[@name='parse' and count(parameter)=2 and parameter[1][@type='android.net.Uri'] and parameter[2][@type='java.io.InputStream']]">Java.Lang.Object</attr>
+    
 </metadata>
diff --git a/ExoPlayer.SmoothStreaming/Transforms/Metadata.xml b/ExoPlayer.SmoothStreaming/Transforms/Metadata.xml
index 20ee8877..a3d0ff00 100644
--- a/ExoPlayer.SmoothStreaming/Transforms/Metadata.xml
+++ b/ExoPlayer.SmoothStreaming/Transforms/Metadata.xml
@@ -28,5 +28,10 @@
 
     <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.source.smoothstreaming.manifest']/class[@name='SsManifest']/method[@name='copy' and count(parameter)=1 and parameter[1][@type='java.util.List&lt;com.google.android.exoplayer2.source.smoothstreaming.manifest.StreamKey&gt;']]">java.lang.Object</attr>
     <attr name="type" path="/api/package[@name='com.google.android.exoplayer2.source.smoothstreaming.manifest']/class[@name='SsManifest']/method[@name='copy' and count(parameter)=1 and parameter[1][@type='java.util.List&lt;com.google.android.exoplayer2.source.smoothstreaming.manifest.StreamKey&gt;']]/parameter[1]">System.Collections.IList</attr>
+
+    <!-- Only in debug mode  -->
+    <attr name="type" path="/api/package[@name='com.google.android.exoplayer2.source.smoothstreaming.offline']/class[@name='SsDownloader']/method[@name='getSegments']/parameter[@name='keys']">java.lang.Object[]</attr>
+    <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.source.smoothstreaming.manifest']/class[@name='FilteringSsManifestParser']/method[@name='parse' and count(parameter)=2 and parameter[1][@type='android.net.Uri'] and parameter[2][@type='java.io.InputStream']]">java.lang.Object</attr>
+    <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.source.smoothstreaming.offline']/class[@name='SsDownloader']/method[@name='getAllRepresentationKeys' and count(parameter)=0]">java.lang.Object[]</attr>
     
 </metadata>