A couple more mobile fixes