Status->Metrics fixes, consistency