more mobile fixes