Further fixes for Measure component