Changes for metrics

Only metric related scripts were adjusted.

Bests,
Johannes