Fixes to graphite tables to address Bug #1