Fixes... final version before Google play 1.1.1