Upstream - Fix issues with mountables