Finally got around to (hopefully) fixing Metrics!