MOBILE-585 Improved logging