fix more metric types