TRAINING-36: More fixes for mobile