More mobile fixes