MOBILE-486 Some corrections after testing in Android