Mobile mode fixes