Some fixes for MC_Metrics from Ramunas