More fixes for mobile app