Add google services fixes