Even more mobile fixes.