Fixed google wallet issues