Fixed moto issues