Mobile fixes, Issue #243