Add fixes for all calculations in metric