Fixed google merchant bugs