More polishing - metrics corrections