Fixes and changes for Play Store release part #2