Couple more mobile fixes