diff --git a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index 67248e3aa9..6777f316ee 100644
--- a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -96,7 +96,6 @@
 import com.brentvatne.common.api.TimedMetadata;
 import com.brentvatne.common.api.Track;
 import com.brentvatne.common.api.VideoTrack;
-import com.brentvatne.common.react.VideoEventEmitter;
 import com.brentvatne.common.toolbox.DebugLog;
 import com.brentvatne.react.R;
 import com.brentvatne.receiver.AudioBecomingNoisyReceiver;
@@ -1432,8 +1431,9 @@ public void onPlaybackParametersChanged(PlaybackParameters params) {
 
     @Override
     public void onVolumeChanged(float volume) {
-        eventEmitter.volumeChange(volume);
-    }
+//        todo
+//        eventEmitter.volumeChange(volume);
+    };
 
     @Override
     public void onIsPlayingChanged(boolean isPlaying) {
@@ -1491,30 +1491,30 @@ public int getTrackRendererIndex(int trackType) {
 
     @Override
     public void onMetadata(@NonNull Metadata metadata) {
-        ArrayList<TimedMetadata> metadataArray = new ArrayList<>();
-        for (int i = 0; i < metadata.length(); i++) {
-            Metadata.Entry entry = metadata.get(i);
-
-            if (entry instanceof Id3Frame) {
-                Id3Frame frame = (Id3Frame) metadata.get(i);
-
-                String value = "";
-
-                if (frame instanceof TextInformationFrame) {
-                    TextInformationFrame txxxFrame = (TextInformationFrame) frame;
-                    value = txxxFrame.value;
-                }
-                TimedMetadata timedMetadata = new TimedMetadata(frame.id, value);
-                metadataArray.add(timedMetadata);
-            } else if (entry instanceof EventMessage) {
-                EventMessage eventMessage = (EventMessage) entry;
-                TimedMetadata timedMetadata = new TimedMetadata(eventMessage.schemeIdUri, eventMessage.value);
-                metadataArray.add(timedMetadata);
-            } else {
-                DebugLog.d(TAG, "unhandled metadata " + entry.toString());
-            }
-        }
-        eventEmitter.timedMetadata(metadataArray);
+//        ArrayList<TimedMetadata> metadataArray = new ArrayList<>();
+//        for (int i = 0; i < metadata.length(); i++) {
+//            Metadata.Entry entry = metadata.get(i);
+//
+//            if (entry instanceof Id3Frame) {
+//                Id3Frame frame = (Id3Frame) metadata.get(i);
+//
+//                String value = "";
+//
+//                if (frame instanceof TextInformationFrame) {
+//                    TextInformationFrame txxxFrame = (TextInformationFrame) frame;
+//                    value = txxxFrame.value;
+//                }
+//                TimedMetadata timedMetadata = new TimedMetadata(frame.id, value);
+//                metadataArray.add(timedMetadata);
+//            } else if (entry instanceof EventMessage) {
+//                EventMessage eventMessage = (EventMessage) entry;
+//                TimedMetadata timedMetadata = new TimedMetadata(eventMessage.schemeIdUri, eventMessage.value);
+//                metadataArray.add(timedMetadata);
+//            } else {
+//                DebugLog.d(TAG, "unhandled metadata " + entry.toString());
+//            }
+//        }
+        eventEmitter.timedMetadata(metadata);
     }
 
     // ReactExoplayerViewManager public api
@@ -2104,7 +2104,7 @@ public void setShutterColor(Integer color) {
     @Override
     public void onAdEvent(AdEvent adEvent) {
         if (adEvent.getAdData() != null) {
-            eventEmitter.receiveAdEvent(adEvent.getType().name(), adEvent.getAdData());
+            eventEmitter.receiveAdEvent(adEvent.getType().name());
         } else {
             eventEmitter.receiveAdEvent(adEvent.getType().name());
         }
@@ -2112,6 +2112,7 @@ public void onAdEvent(AdEvent adEvent) {
 
     @Override
     public void onAdError(AdErrorEvent adErrorEvent) {
-        eventEmitter.receiveAdErrorEvent(adErrorEvent.getError());
+//        todo
+//        eventEmitter.receiveAdErrorEvent(adErrorEvent.getError());
     }
 }
diff --git a/android/src/oldarch/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java b/android/src/oldarch/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java
index d03d178a60..f6de101f8b 100644
--- a/android/src/oldarch/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java
+++ b/android/src/oldarch/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java
@@ -131,7 +131,7 @@ public void setDRM(final ReactExoplayerView videoView, @Nullable ReadableMap drm
         if (drm != null && drm.hasKey(PROP_DRM_TYPE)) {
             String drmType = ReactBridgeUtils.safeGetString(drm, PROP_DRM_TYPE);
             String drmLicenseServer = ReactBridgeUtils.safeGetString(drm, PROP_DRM_LICENSESERVER);
-            ReadableMap drmHeaders = ReactBridgeUtils.safeGetMap(drm, PROP_DRM_HEADERS);
+            ReadableArray drmHeadersArray = (drm.hasKey(PROP_DRM_HEADERS)) ? drm.getArray(PROP_DRM_HEADERS) : null;
             if (drmType != null && drmLicenseServer != null && Util.getDrmUuid(drmType) != null) {
                 UUID drmUUID = Util.getDrmUuid(drmType);
                 videoView.setDrmType(drmUUID);