Final adjustements for play store compatibility