Sensor fixes