More fixing of output metrics