Mobile fixes
Mobile fixes