diff --git a/osu-framework b/osu-framework
index 478d0dd295..b8d0a0050b 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 478d0dd295a66c99556ca8039453e0f806ff4e9b
+Subproject commit b8d0a0050be25aec4333134ca18497340e1154a7
diff --git a/osu.Game/GameModes/Play/Osu/OsuPlayfield.cs b/osu.Game/GameModes/Play/Osu/OsuPlayfield.cs
index a6c4112321..09a7666246 100644
--- a/osu.Game/GameModes/Play/Osu/OsuPlayfield.cs
+++ b/osu.Game/GameModes/Play/Osu/OsuPlayfield.cs
@@ -12,7 +12,7 @@ namespace osu.Game.GameModes.Play.Osu
 {
     public class OsuPlayfield : Playfield
     {
-        protected override Container Content => hitObjectContainer;
+        protected override Container<Drawable> Content => hitObjectContainer;
 
         private Container hitObjectContainer;
 
@@ -53,7 +53,7 @@ namespace osu.Game.GameModes.Play.Osu
 
         class HitObjectContainer : Container
         {
-            protected override Vector2 ChildScale => new Vector2(0.625f);
+            public override Vector2 ChildScale => new Vector2(0.625f);
         }
     }
 }
\ No newline at end of file
diff --git a/osu.Game/Graphics/Containers/ParallaxContainer.cs b/osu.Game/Graphics/Containers/ParallaxContainer.cs
index 3b385af893..5b28779e47 100644
--- a/osu.Game/Graphics/Containers/ParallaxContainer.cs
+++ b/osu.Game/Graphics/Containers/ParallaxContainer.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Graphics.Containers
 
         private Container content;
 
-        protected override Container Content => content;
+        protected override Container<Drawable> Content => content;
 
         protected override void Load(BaseGame game)
         {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 0ac808d1ff..3142446635 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -29,7 +29,7 @@ namespace osu.Game
 
         public APIAccess API;
 
-        protected override Container Content => ratioContainer;
+        protected override Container<Drawable> Content => ratioContainer;
 
         private RatioAdjust ratioContainer;
 
diff --git a/osu.Game/Overlays/ChatConsole.cs b/osu.Game/Overlays/ChatConsole.cs
index c5aec21364..2dd6480715 100644
--- a/osu.Game/Overlays/ChatConsole.cs
+++ b/osu.Game/Overlays/ChatConsole.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays
 
         private Container content;
 
-        protected override Container Content => content;
+        protected override Container<Drawable> Content => content;
 
         private APIAccess api;
 
diff --git a/osu.Game/Overlays/Options/OptionsSection.cs b/osu.Game/Overlays/Options/OptionsSection.cs
index b6d2f4634c..8dc6d271dd 100644
--- a/osu.Game/Overlays/Options/OptionsSection.cs
+++ b/osu.Game/Overlays/Options/OptionsSection.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Options
     public abstract class OptionsSection : Container
     {
         protected FlowContainer content;
-        protected override Container Content => content;
+        protected override Container<Drawable> Content => content;
 
         public abstract FontAwesome Icon { get; }
         protected abstract string Header { get; }
diff --git a/osu.Game/Overlays/Options/OptionsSidebar.cs b/osu.Game/Overlays/Options/OptionsSidebar.cs
index aba1c050af..60936ea6b0 100644
--- a/osu.Game/Overlays/Options/OptionsSidebar.cs
+++ b/osu.Game/Overlays/Options/OptionsSidebar.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Options
     public class OptionsSidebar : Container
     {
         private FlowContainer content;
-        protected override Container Content => content;
+        protected override Container<Drawable> Content => content;
 
         public OptionsSidebar()
         {
diff --git a/osu.Game/Overlays/Options/OptionsSubsection.cs b/osu.Game/Overlays/Options/OptionsSubsection.cs
index 58cb07ad87..8dc9e1d4be 100644
--- a/osu.Game/Overlays/Options/OptionsSubsection.cs
+++ b/osu.Game/Overlays/Options/OptionsSubsection.cs
@@ -7,8 +7,8 @@ namespace osu.Game.Overlays.Options
 {
     public abstract class OptionsSubsection : Container
     {
-        private Container content;
-        protected override Container Content => content;
+        private Container<Drawable> content;
+        protected override Container<Drawable> Content => content;
         
         protected abstract string Header { get; }