Fixes for components with unit conversions