Fix some moto vendor