even more mobile fixes