Thun Sensor fixes for FC 2.0