Testing fixes for mobile