Address metrics related comments