diff --git a/app/src/main/java/com/arn/scrobble/api/ScrobbleEverywhere.kt b/app/src/main/java/com/arn/scrobble/api/ScrobbleEverywhere.kt
index b329184e..33192007 100644
--- a/app/src/main/java/com/arn/scrobble/api/ScrobbleEverywhere.kt
+++ b/app/src/main/java/com/arn/scrobble/api/ScrobbleEverywhere.kt
@@ -274,7 +274,7 @@ object ScrobbleEverywhere {
 
             // track player
             val scrobbleSource = ScrobbleSource(
-                timeMillis = scrobbleData.timestamp * 1000L,
+                timeMillis = scrobbleData.timestamp,
                 pkg = trackInfo.packageName
             )
             PanoDb.db
diff --git a/app/src/main/java/com/arn/scrobble/charts/ChartsPeriodFragment.kt b/app/src/main/java/com/arn/scrobble/charts/ChartsPeriodFragment.kt
index 5d2f9a90..38f088f7 100644
--- a/app/src/main/java/com/arn/scrobble/charts/ChartsPeriodFragment.kt
+++ b/app/src/main/java/com/arn/scrobble/charts/ChartsPeriodFragment.kt
@@ -143,8 +143,8 @@ abstract class ChartsPeriodFragment : Fragment(), MusicEntryItemClickListener {
 
         val timePeriods = viewModel.timePeriods.value.keys
 
-        val startTime = Stuff.timeToUTC(timePeriods.first().start)
-        val endTime = Stuff.timeToUTC(timePeriods.last().end)
+        val startTime = Stuff.timeToUTC(timePeriods.last().start)
+        val endTime = Stuff.timeToUTC(timePeriods.first().end)
         var openAtTime = Stuff.timeToUTC(
             viewModel.selectedPeriod.value.start
         )
diff --git a/app/src/main/java/com/arn/scrobble/info/InfoExtraFragment.kt b/app/src/main/java/com/arn/scrobble/info/InfoExtraFragment.kt
index d34c0c96..59c3987a 100644
--- a/app/src/main/java/com/arn/scrobble/info/InfoExtraFragment.kt
+++ b/app/src/main/java/com/arn/scrobble/info/InfoExtraFragment.kt
@@ -162,6 +162,8 @@ class InfoExtraFragment : BottomSheetDialogFragment(), MusicEntryItemClickListen
                     val features =
                         spotifyTrackWithFeatures.features ?: return@collectLatestLifecycleFlow
 
+                    _binding ?: return@collectLatestLifecycleFlow
+
                     this@InfoExtraFragment.scheduleTransition()
                     val spotifyFeaturesBinding = LayoutSpotifyTrackFeaturesBinding.bind(
                         binding.infoSpotifyFeatures.inflate()
diff --git a/app/src/main/java/com/arn/scrobble/recents/ScrobblesAdapter.kt b/app/src/main/java/com/arn/scrobble/recents/ScrobblesAdapter.kt
index de38992c..ff44c057 100644
--- a/app/src/main/java/com/arn/scrobble/recents/ScrobblesAdapter.kt
+++ b/app/src/main/java/com/arn/scrobble/recents/ScrobblesAdapter.kt
@@ -317,7 +317,7 @@ class ScrobblesAdapter(
         }
 
         private fun setPlayerIcon(track: Track) {
-            val timeSecs = track.date
+            val time = track.date
             binding.playerIcon.visibility = View.VISIBLE
 
             fun fetchIcon(pkgName: String) {
@@ -329,19 +329,19 @@ class ScrobblesAdapter(
                 }
             }
 
-            if (timeSecs != null && viewModel.pkgMap[timeSecs] != null) {
-                fetchIcon(viewModel.pkgMap[timeSecs]!!)
+            if (time != null && viewModel.pkgMap[time] != null) {
+                fetchIcon(viewModel.pkgMap[time]!!)
             } else {
                 binding.playerIcon.dispose()
                 binding.playerIcon.load(null)
                 binding.playerIcon.contentDescription = null
                 job?.cancel()
 
-                if (timeSecs != null) {
+                if (time != null) {
                     job = viewModel.viewModelScope.launch(Dispatchers.IO) {
                         delay(100)
-                        playerDao.findPlayer(timeSecs)?.pkg?.let { pkgName ->
-                            viewModel.pkgMap[timeSecs] = pkgName
+                        playerDao.findPlayer(time)?.pkg?.let { pkgName ->
+                            viewModel.pkgMap[time] = pkgName
                             fetchIcon(pkgName)
                         }
                     }