diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 43b2486ac5..4825569ee4 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Beatmaps
 
         protected override string[] HashableFileTypes => new[] { ".osu" };
 
-        protected override bool CheckStableDirectoryExists(StableStorage stableStorage) => stableStorage.GetSongStorage().ExistsDirectory(".");
+        protected override bool StableDirectoryExists(StableStorage stableStorage) => stableStorage.GetSongStorage().ExistsDirectory(".");
 
         protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStorage)
         {
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index ae1608d801..fd94660a4b 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -640,10 +640,10 @@ namespace osu.Game.Database
         /// <summary>
         /// Checks for the existence of an osu-stable directory.
         /// </summary>
-        protected virtual bool CheckStableDirectoryExists(StableStorage stableStorage) => stableStorage.ExistsDirectory(ImportFromStablePath);
+        protected virtual bool StableDirectoryExists(StableStorage stableStorage) => stableStorage.ExistsDirectory(ImportFromStablePath);
 
         /// <summary>
-        /// Select paths to import from stable. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
+        /// Select paths to import from stable where all paths should be absolute. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
         /// </summary>
         protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStorage) => stableStorage.GetDirectories(ImportFromStablePath)
                                                                                                                 .Select(path => stableStorage.GetFullPath(path));
@@ -668,7 +668,7 @@ namespace osu.Game.Database
                 return Task.CompletedTask;
             }
 
-            if (!CheckStableDirectoryExists(stable))
+            if (!StableDirectoryExists(stable))
             {
                 // This handles situations like when the user does not have a Skins folder
                 Logger.Log($"No {ImportFromStablePath} folder available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
index ebceba6ce0..f86b18c724 100644
--- a/osu.Game/IO/StableStorage.cs
+++ b/osu.Game/IO/StableStorage.cs
@@ -35,12 +35,13 @@ namespace osu.Game.IO
         {
             var songsDirectoryPath = Path.Combine(BasePath, stable_default_songs_path);
 
-            var configFile = GetFiles(".", "osu!.*.cfg").FirstOrDefault();
+            var configFile = GetFiles(".", "osu!.*.cfg").SingleOrDefault();
 
             if (configFile == null)
                 return songsDirectoryPath;
 
-            using (var textReader = new StreamReader(GetStream(configFile)))
+            using (var stream = GetStream(configFile))
+            using (var textReader = new StreamReader(stream))
             {
                 string line;