MOBILE-557 Fixes in the offline download