diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index df9b304a47..def9c13c10 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -94,9 +94,7 @@ namespace osu.Game.Screens.Menu
             {
                 if (!track.IsRunning)
                 {
-                    track.Seek(metadata.PreviewTime);
-                    if (metadata.PreviewTime == -1)
-                        track.Seek(track.Length * 0.4f);
+                    track.Seek(metadata.PreviewTime != -1 ? metadata.PreviewTime : 0.4f * track.Length);
                     track.Start();
                 }
             }
diff --git a/osu.Game/Screens/Play/SongProgressGraph.cs b/osu.Game/Screens/Play/SongProgressGraph.cs
index 9251ca33a4..541065e532 100644
--- a/osu.Game/Screens/Play/SongProgressGraph.cs
+++ b/osu.Game/Screens/Play/SongProgressGraph.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Play
                     return;
 
                 var firstHit = objects.First().StartTime;
-                var lastHit = (objects.Last() as IHasEndTime)?.EndTime ?? 0;
+                var lastHit = objects.Max(o => (o as IHasEndTime)?.EndTime ?? o.StartTime);
 
                 if (lastHit == 0)
                     lastHit = objects.Last().StartTime;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 2b2ba83043..baa0f180f5 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -190,7 +190,7 @@ namespace osu.Game.Screens.Select
 
         private void carouselBeatmapsLoaded()
         {
-            if (Beatmap.Value != null && Beatmap.Value.BeatmapSetInfo?.DeletePending != false)
+            if (Beatmap.Value.BeatmapSetInfo?.DeletePending == false)
                 carousel.SelectBeatmap(Beatmap.Value.BeatmapInfo, false);
             else
                 carousel.SelectNext();