Fixed MeasurementController bugs