Tweaks to fix mobile bugs