Mobile mode fixes #3