Small tweaks for Mobile