Mobile fixes 1