Even more mobile fixes