Various maintenance changes to stay compatible with latest android and on the play store