Fixes with the metric stuff