Fixes and Mobile Support