Mobile related tweaks