Fix graphite metrics

Some QA changes ;-)