Further mobile fixes