Fixes to make it pass Google Play Store requirements