diff --git a/app/src/main/java/org/jellyfin/mobile/player/PlayerFragment.kt b/app/src/main/java/org/jellyfin/mobile/player/PlayerFragment.kt
index dc085bd7..4ea8536f 100644
--- a/app/src/main/java/org/jellyfin/mobile/player/PlayerFragment.kt
+++ b/app/src/main/java/org/jellyfin/mobile/player/PlayerFragment.kt
@@ -123,6 +123,7 @@ class PlayerFragment : Fragment() {
                 is PlayerException.InvalidPlayOptions -> context.toast(R.string.player_error_invalid_play_options)
                 is PlayerException.NetworkFailure -> context.toast(R.string.player_error_network_failure)
                 is PlayerException.UnsupportedContent -> context.toast(R.string.player_error_unsupported_content)
+                null -> Unit // success
             }
         }
     }
diff --git a/app/src/main/java/org/jellyfin/mobile/player/PlayerViewModel.kt b/app/src/main/java/org/jellyfin/mobile/player/PlayerViewModel.kt
index 1fd865a8..62d8e162 100644
--- a/app/src/main/java/org/jellyfin/mobile/player/PlayerViewModel.kt
+++ b/app/src/main/java/org/jellyfin/mobile/player/PlayerViewModel.kt
@@ -126,9 +126,9 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application),
                 val customPrefs = displayPreferencesDto.customPrefs
 
                 displayPreferences = DisplayPreferences(
-                    skipBackLength = customPrefs?.get(Constants.DISPLAY_PREFERENCES_SKIP_BACK_LENGTH)?.toLongOrNull()
+                    skipBackLength = customPrefs[Constants.DISPLAY_PREFERENCES_SKIP_BACK_LENGTH]?.toLongOrNull()
                         ?: Constants.DEFAULT_SEEK_TIME_MS,
-                    skipForwardLength = customPrefs?.get(Constants.DISPLAY_PREFERENCES_SKIP_FORWARD_LENGTH)?.toLongOrNull()
+                    skipForwardLength = customPrefs[Constants.DISPLAY_PREFERENCES_SKIP_FORWARD_LENGTH]?.toLongOrNull()
                         ?: Constants.DEFAULT_SEEK_TIME_MS
                 )
             } catch (e: ApiClientException) {
diff --git a/app/src/main/java/org/jellyfin/mobile/utils/MediaExtensions.kt b/app/src/main/java/org/jellyfin/mobile/utils/MediaExtensions.kt
index 6acd56bb..7ccd1cc7 100644
--- a/app/src/main/java/org/jellyfin/mobile/utils/MediaExtensions.kt
+++ b/app/src/main/java/org/jellyfin/mobile/utils/MediaExtensions.kt
@@ -89,5 +89,5 @@ fun Player.seekToOffset(offsetMs: Long) {
 }
 
 fun Player.logTracks(analyticsCollector: AnalyticsCollector) {
-    analyticsCollector.onTracksChanged(currentTrackGroups, currentTrackSelections)
+    analyticsCollector.onTracksInfoChanged(currentTracksInfo)
 }
diff --git a/app/src/main/java/org/jellyfin/mobile/utils/TrackSelectionUtils.kt b/app/src/main/java/org/jellyfin/mobile/utils/TrackSelectionUtils.kt
index c9fa1ad3..6d89ddca 100644
--- a/app/src/main/java/org/jellyfin/mobile/utils/TrackSelectionUtils.kt
+++ b/app/src/main/java/org/jellyfin/mobile/utils/TrackSelectionUtils.kt
@@ -4,7 +4,6 @@ import com.google.android.exoplayer2.C
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector
 
-
 /**
  * Get the index of the first renderer of the specified [type] supporting the track with the specified [groupIndex].
  *