Mobile mode fixes #4