Some fixes into Sensor MO