Some mobile fixes