Swap latest code: mobile fixes