Fix up moto G