Fix some not working metrics