Add some mobile fixes