Back to mobile fixes [ci skip]