SOS: various fix for Measurement v1.0