Mobile fixes #2