diff --git a/osu-framework b/osu-framework
index 31754e8fd0..b43aecdce9 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 31754e8fd0eb840b6aca03ec481b677665999211
+Subproject commit b43aecdce95f59912aa0b7211dde3aba1ed9afb1
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerSpmCounter.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerSpmCounter.cs
index c079d3343b..ebe978f659 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerSpmCounter.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerSpmCounter.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             if (records.Count > 0)
             {
                 var record = records.Peek();
-                while (Time.Current - records.Peek().Time > spm_count_duration)
+                while (records.Count > 0 && Time.Current - records.Peek().Time > spm_count_duration)
                     record = records.Dequeue();
                 SpinsPerMinute = (currentRotation - record.Rotation) / (Time.Current - record.Time) * 1000 * 60 / 360;
             }
diff --git a/osu.Game/Graphics/Processing/RatioAdjust.cs b/osu.Game/Graphics/Processing/RatioAdjust.cs
deleted file mode 100644
index 640814d8e1..0000000000
--- a/osu.Game/Graphics/Processing/RatioAdjust.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System;
-using osu.Framework.Graphics.Containers;
-using OpenTK;
-using osu.Framework.Graphics;
-
-namespace osu.Game.Graphics.Processing
-{
-    internal class RatioAdjust : Container
-    {
-        public RatioAdjust()
-        {
-            RelativeSizeAxes = Axes.Both;
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-            Vector2 parent = Parent.DrawSize;
-
-            Scale = new Vector2(Math.Min(parent.Y / 768f, parent.X / 1024f));
-            Size = new Vector2(1 / Scale.X);
-        }
-    }
-}
diff --git a/osu.Game/Online/API/Requests/GetBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/GetBeatmapSetsRequest.cs
index 470e13ea7b..d216b093ee 100644
--- a/osu.Game/Online/API/Requests/GetBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetBeatmapSetsRequest.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Online.API.Requests
         private int onlineId { get; set; }
 
         [JsonProperty(@"creator")]
-        private string creatorUsername;
+        private string creatorUsername { get; set; }
 
         [JsonProperty(@"user_id")]
         private long creatorId = 1;
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 8e7bfa8a76..93eb1d76df 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -15,7 +15,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
-using osu.Game.Graphics.Processing;
 using osu.Game.Online.API;
 using SQLite.Net;
 using osu.Framework.Graphics.Performance;
@@ -186,7 +185,7 @@ namespace osu.Game
 
             GlobalKeyBindingInputManager globalBinding;
 
-            base.Content.Add(new RatioAdjust
+            base.Content.Add(new DrawSizePreservingFillContainer
             {
                 Children = new Drawable[]
                 {
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index cc0753d860..5774fb67d2 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -57,7 +57,6 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <Prefer32Bit>false</Prefer32Bit>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
@@ -77,7 +76,6 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
@@ -103,7 +101,6 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <LangVersion>6</LangVersion>
     <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <StartArguments>--tests</StartArguments>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -313,7 +310,6 @@
     <Compile Include="Graphics\Cursor\OsuTooltipContainer.cs" />
     <Compile Include="Graphics\IHasAccentColour.cs" />
     <Compile Include="Graphics\OsuColour.cs" />
-    <Compile Include="Graphics\Processing\RatioAdjust.cs" />
     <Compile Include="Graphics\SpriteIcon.cs" />
     <Compile Include="Graphics\Sprites\OsuSpriteText.cs" />
     <Compile Include="Graphics\UserInterface\BackButton.cs" />