Fixed some metric keys