diff --git a/osu.Game/IO/FileStore.cs b/osu.Game/IO/FileStore.cs
index e3728ab16d..e8cabafe17 100644
--- a/osu.Game/IO/FileStore.cs
+++ b/osu.Game/IO/FileStore.cs
@@ -44,7 +44,7 @@ namespace osu.Game.IO
 
         public FileInfo Add(Stream data, string filename = null)
         {
-            string hash = data.GetSHA2Hash();
+            string hash = data.ComputeSHA2Hash();
 
             var info = new FileInfo
             {
diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 809e771840..fcebca6fe3 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Allocation;
 using osu.Game.Users;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Chat
 {
@@ -164,10 +165,12 @@ namespace osu.Game.Overlays.Chat
                     Padding = new MarginPadding { Left = message_padding + padding },
                     Children = new Drawable[]
                     {
-                        new OsuSpriteText
+                        new OsuTextFlowContainer(t =>
+                        {
+                            t.TextSize = text_size;
+                        })
                         {
                             Text = Message.Content,
-                            TextSize = text_size,
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
                         }
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index f38d2c454a..a5486efa96 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.Select
                     requestedBeatmap.Metrics = res;
                     Schedule(() => updateMetrics(res));
                 };
-                lookup.Failure += e => updateMetrics(null);
+                lookup.Failure += e => Schedule(() => updateMetrics(null));
 
                 api.Queue(lookup);
                 loading.Show();