Mobile fixes
