Some more mobile fixes