MOBILE-168 More minor fixes