MOBILE-489 Integrator review fixes