diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt
index 3b3377bb1..1673cb84d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt
@@ -3,19 +3,19 @@ package code.name.monkey.retromusic.activities
 import android.os.Bundle
 import android.widget.Button
 import android.widget.ImageView
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import cat.ereza.customactivityoncrash.CustomActivityOnCrash
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.util.FileUtils.createFile
 import code.name.monkey.retromusic.util.Share.shareFile
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.*
 
 class ErrorActivity : AppCompatActivity() {
     private val dayFormat: DateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
-    private val ReportPrefix = "bug_report-"
+    private val reportPrefix = "bug_report-"
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.customactivityoncrash_default_error_activity)
@@ -39,7 +39,7 @@ class ErrorActivity : AppCompatActivity() {
             findViewById<Button>(R.id.customactivityoncrash_error_activity_more_info_button)
 
         moreInfoButton.setOnClickListener { //We retrieve all the error data and show it
-            AlertDialog.Builder(this@ErrorActivity)
+            MaterialAlertDialogBuilder(this@ErrorActivity)
                 .setTitle(R.string.customactivityoncrash_error_activity_error_details_title)
                 .setMessage(
                     CustomActivityOnCrash.getAllErrorDetailsFromIntent(
@@ -58,7 +58,7 @@ class ErrorActivity : AppCompatActivity() {
                     val bugReport = createFile(
                         context = this,
                         "Bug Report",
-                        "$ReportPrefix${dayFormat.format(Date())}",
+                        "$reportPrefix${dayFormat.format(Date())}",
                         CustomActivityOnCrash.getAllErrorDetailsFromIntent(
                             this@ErrorActivity,
                             intent
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt
index 0144ae835..2356aeba9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt
@@ -164,6 +164,7 @@ class PlayerFragment : AbsPlayerFragment(R.layout.fragment_player),
     }
 
     private fun startOrStopSnow(isSnowFalling: Boolean) {
+        if (_binding == null) return
         if (isSnowFalling && !surfaceColor().isColorLight) {
             binding.snowfallView.isVisible = true
             binding.snowfallView.restartFalling()
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
index 0bc1af087..81ab6a947 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
@@ -115,11 +115,7 @@ object MusicPlayerRemote : KoinComponent {
 
     fun bindToService(context: Context, callback: ServiceConnection): ServiceToken? {
 
-        var realActivity: Activity? = (context as Activity).parent
-        if (realActivity == null) {
-            realActivity = context
-        }
-
+        val realActivity = (context as Activity).parent ?: context
         val contextWrapper = ContextWrapper(realActivity)
         val intent = Intent(contextWrapper, MusicService::class.java)
         try {
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MediaSessionCallback.kt b/app/src/main/java/code/name/monkey/retromusic/service/MediaSessionCallback.kt
index d2b604231..abefd4491 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MediaSessionCallback.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MediaSessionCallback.kt
@@ -39,7 +39,6 @@ import org.koin.core.component.inject
  */
 
 class MediaSessionCallback(
-    private val context: Context,
     private val musicService: MusicService
 ) : MediaSessionCompat.Callback(), KoinComponent {
 
@@ -191,7 +190,6 @@ class MediaSessionCallback(
             }
             TOGGLE_FAVORITE -> {
                 musicService.toggleFavorite()
-                musicService.updateMediaSessionPlaybackState()
             }
             else -> {
                 println("Unsupported action: $action")
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
index 2c4afb7fa..c3055e8c7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
@@ -1339,7 +1339,7 @@ class MusicService : MediaBrowserServiceCompat(),
             this,
             "RetroMusicPlayer"
         )
-        val mediasessionCallback = MediaSessionCallback(applicationContext, this)
+        val mediasessionCallback = MediaSessionCallback(this)
         mediaSession?.setCallback(mediasessionCallback)
         mediaSession?.isActive = true
     }