Fix a couple small issues with graphite datasource