mobile-integration: fixes after initial testing on real devices