still more mobile fixes