Johns mobile fixes :)