Mobile improvements #5413016